summaryrefslogtreecommitdiff
path: root/kernel/printk/printk.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-03-11 15:53:25 +0300
committerMark Brown <broonie@kernel.org>2015-03-11 15:53:25 +0300
commit11dd60447e3b1018f9cae66737cb902b519d3454 (patch)
treea33d8bcb18a3becae2161aa215c25d5674626c57 /kernel/printk/printk.c
parent8d0c38a3f2a6bb70e952f127ed817fc7a08db52c (diff)
parent9eccca0843205f87c00404b663188b88eb248051 (diff)
downloadlinux-11dd60447e3b1018f9cae66737cb902b519d3454.tar.xz
Merge tag 'v4.0-rc3' into asoc-intel
Linux 4.0-rc3
Diffstat (limited to 'kernel/printk/printk.c')
-rw-r--r--kernel/printk/printk.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 01cfd69c54c6..bb0635bd74f2 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2464,6 +2464,7 @@ void register_console(struct console *newcon)
for (i = 0, c = console_cmdline;
i < MAX_CMDLINECONSOLES && c->name[0];
i++, c++) {
+ BUILD_BUG_ON(sizeof(c->name) != sizeof(newcon->name));
if (strcmp(c->name, newcon->name) != 0)
continue;
if (newcon->index >= 0 &&