aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2007-05-08 03:26:47 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 14:15:04 -0400
commit6ae9200f2cab7b328e505fc9a7021db64e0590cf (patch)
treef3516ed394d6439f22d669329b4f47a0751e1f84
parent19c5d45a09312ca20cd1f9df3fd1a87fe0cb8aac (diff)
enlarge console.name
console.name[] is eight chars, but so is "earlyvga". So when we try to print console->name when using earlyvga it runs off the end of the string. Make it bigger. Diagnosed-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/console.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/console.h b/include/linux/console.h
index de25ee3b7919..fcc18e012e45 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -92,9 +92,8 @@ void give_up_console(const struct consw *sw);
92#define CON_BOOT (8) 92#define CON_BOOT (8)
93#define CON_ANYTIME (16) /* Safe to call when cpu is offline */ 93#define CON_ANYTIME (16) /* Safe to call when cpu is offline */
94 94
95struct console 95struct console {
96{ 96 char name[16];
97 char name[8];
98 void (*write)(struct console *, const char *, unsigned); 97 void (*write)(struct console *, const char *, unsigned);
99 int (*read)(struct console *, char *, unsigned); 98 int (*read)(struct console *, char *, unsigned);
100 struct tty_driver *(*device)(struct console *, int *); 99 struct tty_driver *(*device)(struct console *, int *);