Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek...

[sfrench/cifs-2.6.git] / kernel / printk / printk.c

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 63416bb2712a72a5056975685b806f48f2cd7d08..db4b9b8929ebf9afb425e36c3908b9f3ca1908e9 100644 (file)
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -924,10 +924,10 @@ static loff_t devkmsg_llseek(struct file *file, loff_t offset, int whence)
        return ret;
 }
 
-static unsigned int devkmsg_poll(struct file *file, poll_table *wait)
+static __poll_t devkmsg_poll(struct file *file, poll_table *wait)
 {
        struct devkmsg_user *user = file->private_data;
-       int ret = 0;
+       __poll_t ret = 0;
 
        if (!user)
                return POLLERR|POLLNVAL;
@@ -3310,9 +3310,6 @@ void dump_stack_print_info(const char *log_lvl)
 void show_regs_print_info(const char *log_lvl)
 {
        dump_stack_print_info(log_lvl);
-
-       printk("%stask: %p task.stack: %p\n",
-              log_lvl, current, task_stack_page(current));
 }
 
 #endif