aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorJan Engelmohr <jan.engelmohr@mailbox.tu-dresden.de>2016-07-26 18:11:29 +0200
committerMoyster <oysterized@gmail.com>2016-08-26 16:00:22 +0200
commitd668de80d065e7796d2fb31cf2c66084850baa2f (patch)
treee44b4f602ca66eddfd3f884618501fb473214a0b /kernel
parent42fb8800204306978c6fb8f99ef68b8c1e895fd2 (diff)
3.10.74 -> 3.10.75
Diffstat (limited to 'kernel')
-rw-r--r--kernel/printk.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/printk.c b/kernel/printk.c
index f16850870..b30c61814 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -124,7 +124,7 @@ static struct console *exclusive_console;
*/
struct console_cmdline
{
- char name[8]; /* Name of the driver */
+ char name[16]; /* Name of the driver */
int index; /* Minor dev. to use */
char *options; /* Options for the driver */
#ifdef CONFIG_A11Y_BRAILLE_CONSOLE
@@ -2463,6 +2463,8 @@ void register_console(struct console *newcon)
*/
for (i = 0; i < MAX_CMDLINECONSOLES && console_cmdline[i].name[0];
i++) {
+ BUILD_BUG_ON(sizeof(console_cmdline[i].name) !=
+ sizeof(newcon->name));
if (strcmp(console_cmdline[i].name, newcon->name) != 0)
continue;
if (newcon->index >= 0 &&