printk: rename log_wait to printk_log_wait

Make this generic variable more specific to the printk
subsystem to allow this variable to be used without
a specific extern.

Also update fs/proc/kmsg.c as it uses log_wait.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Kay Sievers <kay@vrfy.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/fs/proc/kmsg.c b/fs/proc/kmsg.c
index bd4b5a740ff1b9de6492f5da9adaf7e500d35b25..16f2c8546eb0d242a0a22242d776f6a744720df6 100644 (file)
--- a/fs/proc/kmsg.c
+++ b/fs/proc/kmsg.c
@@ -17,7 +17,7 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
-extern wait_queue_head_t log_wait;
+extern wait_queue_head_t printk_log_wait;
 
 static int kmsg_open(struct inode * inode, struct file * file)
 {
@@ -41,7 +41,7 @@ static ssize_t kmsg_read(struct file *file, char __user *buf,
 
 static unsigned int kmsg_poll(struct file *file, poll_table *wait)
 {
-       poll_wait(file, &log_wait, wait);
+       poll_wait(file, &printk_log_wait, wait);
        if (do_syslog(SYSLOG_ACTION_SIZE_UNREAD, NULL, 0, SYSLOG_FROM_FILE))
                return POLLIN | POLLRDNORM;
        return 0;

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index e5b54a0d1287e461a315daece327454b3240f3f7..848b485d364321d4562bab4354b049b49d0b889d 100644 (file)
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -63,7 +63,7 @@ void asmlinkage __attribute__((weak)) early_printk(const char *fmt, ...)
 #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */
 #define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */
 
-DECLARE_WAIT_QUEUE_HEAD(log_wait);
+DECLARE_WAIT_QUEUE_HEAD(printk_log_wait);
 
 int console_printk[4] = {
        DEFAULT_CONSOLE_LOGLEVEL,       /* console_loglevel */
@@ -453,7 +453,7 @@ static ssize_t devkmsg_read(struct file *file, char __user *buf,
                }
 
                raw_spin_unlock_irq(&logbuf_lock);
-               ret = wait_event_interruptible(log_wait,
+               ret = wait_event_interruptible(printk_log_wait,
                                               user->seq != printk_log_next_seq);
                if (ret)
                        goto out;
@@ -595,7 +595,7 @@ static unsigned int devkmsg_poll(struct file *file, poll_table *wait)
        if (!user)
                return POLLERR|POLLNVAL;
 
-       poll_wait(file, &log_wait, wait);
+       poll_wait(file, &printk_log_wait, wait);
 
        raw_spin_lock_irq(&logbuf_lock);
        if (user->seq < printk_log_next_seq) {
@@ -1128,7 +1128,7 @@ int do_syslog(int type, char __user *buf, int len, bool from_file)
                        error = -EFAULT;
                        goto out;
                }
-               error = wait_event_interruptible(log_wait,
+               error = wait_event_interruptible(printk_log_wait,
                                                 syslog_seq != printk_log_next_seq);
                if (error)
                        goto out;
@@ -1956,7 +1956,7 @@ void printk_tick(void)
                        printk(KERN_WARNING "[sched_delayed] %s", buf);
                }
                if (pending & PRINTK_PENDING_WAKEUP)
-                       wake_up_interruptible(&log_wait);
+                       wake_up_interruptible(&printk_log_wait);
        }
 }
 
@@ -1969,7 +1969,7 @@ int printk_needs_cpu(int cpu)
 
 void wake_up_klogd(void)
 {
-       if (waitqueue_active(&log_wait))
+       if (waitqueue_active(&printk_log_wait))
                this_cpu_or(printk_pending, PRINTK_PENDING_WAKEUP);
 }