Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / fs / proc / proc_sysctl.c

diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index 612df79cc6a11db724bf93d8941311fb780fdd08..ac05f33a0dde360aebbcacd9d02df8a8b927797a 100644 (file)
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -5,6 +5,7 @@
 #include <linux/sysctl.h>
 #include <linux/poll.h>
 #include <linux/proc_fs.h>
+#include <linux/printk.h>
 #include <linux/security.h>
 #include <linux/sched.h>
 #include <linux/namei.h>
@@ -57,7 +58,7 @@ static void sysctl_print_dir(struct ctl_dir *dir)
 {
        if (dir->header.parent)
                sysctl_print_dir(dir->header.parent);
-       printk(KERN_CONT "%s/", dir->header.ctl_table[0].procname);
+       pr_cont("%s/", dir->header.ctl_table[0].procname);
 }
 
 static int namecmp(const char *name1, int len1, const char *name2, int len2)
@@ -134,9 +135,9 @@ static int insert_entry(struct ctl_table_header *head, struct ctl_table *entry)
                else if (cmp > 0)
                        p = &(*p)->rb_right;
                else {
-                       printk(KERN_ERR "sysctl duplicate entry: ");
+                       pr_err("sysctl duplicate entry: ");
                        sysctl_print_dir(head->parent);
-                       printk(KERN_CONT "/%s\n", entry->procname);
+                       pr_cont("/%s\n", entry->procname);
                        return -EEXIST;
                }
        }
@@ -927,9 +928,9 @@ found:
        subdir->header.nreg++;
 failed:
        if (unlikely(IS_ERR(subdir))) {
-               printk(KERN_ERR "sysctl could not get directory: ");
+               pr_err("sysctl could not get directory: ");
                sysctl_print_dir(dir);
-               printk(KERN_CONT "/%*.*s %ld\n",
+               pr_cont("/%*.*s %ld\n",
                        namelen, namelen, name, PTR_ERR(subdir));
        }
        drop_sysctl_table(&dir->header);
@@ -995,8 +996,8 @@ static int sysctl_err(const char *path, struct ctl_table *table, char *fmt, ...)
        vaf.fmt = fmt;
        vaf.va = &args;
 
-       printk(KERN_ERR "sysctl table check failed: %s/%s %pV\n",
-               path, table->procname, &vaf);
+       pr_err("sysctl table check failed: %s/%s %pV\n",
+              path, table->procname, &vaf);
 
        va_end(args);
        return -EINVAL;
@@ -1510,9 +1511,9 @@ static void put_links(struct ctl_table_header *header)
                        drop_sysctl_table(link_head);
                }
                else {
-                       printk(KERN_ERR "sysctl link missing during unregister: ");
+                       pr_err("sysctl link missing during unregister: ");
                        sysctl_print_dir(parent);
-                       printk(KERN_CONT "/%s\n", name);
+                       pr_cont("/%s\n", name);
                }
        }
 }