Merge Linux 4.4.203-rc2 into 10

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / kernel / printk / printk.c

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 62ffd41..3575b20 100644 (file)
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -236,7 +236,11 @@ struct printk_log {
        u8 facility;            /* syslog facility */
        u8 flags:5;             /* internal record flags */
        u8 level:3;             /* syslog level */
-};
+}
+#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
+__packed __aligned(4)
+#endif
+;
 
 /*
  * The logbuf_lock protects kmsg buffer, indices, counters.  This can be taken
@@ -277,12 +281,9 @@ static u32 clear_idx;
 #define LOG_FACILITY(v)                ((v) >> 3 & 0xff)
 
 /* record buffer */
-#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS)
-#define LOG_ALIGN 4
-#else
 #define LOG_ALIGN __alignof__(struct printk_log)
-#endif
 #define __LOG_BUF_LEN (1 << CONFIG_LOG_BUF_SHIFT)
+#define LOG_BUF_LEN_MAX (u32)(1 << 31)
 static char __log_buf[__LOG_BUF_LEN] __aligned(LOG_ALIGN);
 static char *log_buf = __log_buf;
 static u32 log_buf_len = __LOG_BUF_LEN;
@@ -874,18 +875,23 @@ void log_buf_kexec_setup(void)
 static unsigned long __initdata new_log_buf_len;
 
 /* we practice scaling the ring buffer by powers of 2 */
-static void __init log_buf_len_update(unsigned size)
+static void __init log_buf_len_update(u64 size)
 {
+       if (size > (u64)LOG_BUF_LEN_MAX) {
+               size = (u64)LOG_BUF_LEN_MAX;
+               pr_err("log_buf over 2G is not supported.\n");
+       }
+
        if (size)
                size = roundup_pow_of_two(size);
        if (size > log_buf_len)
-               new_log_buf_len = size;
+               new_log_buf_len = (unsigned long)size;
 }
 
 /* save requested log_buf_len since it's too early to process it */
 static int __init log_buf_len_setup(char *str)
 {
-       unsigned int size;
+       u64 size;
 
        if (!str)
                return -EINVAL;
@@ -955,7 +961,7 @@ void __init setup_log_buf(int early)
        }
 
        if (unlikely(!new_log_buf)) {
-               pr_err("log_buf_len: %ld bytes not available\n",
+               pr_err("log_buf_len: %lu bytes not available\n",
                        new_log_buf_len);
                return;
        }
@@ -968,8 +974,8 @@ void __init setup_log_buf(int early)
        memcpy(log_buf, __log_buf, __LOG_BUF_LEN);
        raw_spin_unlock_irqrestore(&logbuf_lock, flags);
 
-       pr_info("log_buf_len: %d bytes\n", log_buf_len);
-       pr_info("early log buf free: %d(%d%%)\n",
+       pr_info("log_buf_len: %u bytes\n", log_buf_len);
+       pr_info("early log buf free: %u(%u%%)\n",
                free, (free * 100) / __LOG_BUF_LEN);
 }
 
@@ -2124,6 +2130,8 @@ void resume_console(void)
        console_unlock();
 }
 
+#ifdef CONFIG_CONSOLE_FLUSH_ON_HOTPLUG
+
 /**
  * console_cpu_notify - print deferred console messages after CPU hotplug
  * @self: notifier struct
@@ -2143,12 +2151,18 @@ static int console_cpu_notify(struct notifier_block *self,
        case CPU_DEAD:
        case CPU_DOWN_FAILED:
        case CPU_UP_CANCELED:
+       case CPU_DYING:
+#ifdef CONFIG_CONSOLE_FLUSH_ON_HOTPLUG
                console_lock();
                console_unlock();
+#endif
+               break;
        }
        return NOTIFY_OK;
 }
 
+#endif
+
 /**
  * console_lock - lock the console system for exclusive use.
  *
@@ -2713,7 +2727,9 @@ static int __init printk_late_init(void)
                        unregister_console(con);
                }
        }
+#ifdef CONFIG_CONSOLE_FLUSH_ON_HOTPLUG
        hotcpu_notifier(console_cpu_notify, 0);
+#endif
        return 0;
 }
 late_initcall(printk_late_init);
@@ -3056,7 +3072,7 @@ bool kmsg_dump_get_buffer(struct kmsg_dumper *dumper, bool syslog,
        seq = dumper->cur_seq;
        idx = dumper->cur_idx;
        prev = 0;
-       while (l > size && seq < dumper->next_seq) {
+       while (l >= size && seq < dumper->next_seq) {
                struct printk_log *msg = log_from_idx(idx);
 
                l -= msg_print_text(msg, prev, true, NULL, 0);