Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6e537e9329d133526a576b741f85b3d48edc4ac1
Commit: 6e537e9329d133526a576b741f85b3d48edc4ac1
Parent: 8a0e6656030ffe9bcb81b725e956917bafc7522d
Author: Michael Hennerich <[EMAIL PROTECTED]>
AuthorDate: Mon May 21 18:09:20 2007 +0800
Committer: Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Mon May 21 09:50:22 2007 -0700
Blackfin arch: Fix bug using usb keyboard crashes kernel
Without conswitchp preset, we have the following situation:
- During initcalls: con_init is called, and returns because of
!display_desc.
- At this point there is no memory allocated for vc_cons[].d
A bit later vty_init calls kbd_init.
- From now on events are passed to kbd_event which will then call
kbd_keycode.
- kbd_keycode will oops on a NULL pointer dereference on vc->vc_tty
Signed-off-by: Michael Hennerich <[EMAIL PROTECTED]>
Cc: Pekka Enberg <[EMAIL PROTECTED]>
Signed-off-by: Bryan Wu <[EMAIL PROTECTED]>
[ Added commit description based on email thread. - Linus ]
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
arch/blackfin/kernel/setup.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index 342bb8d..c456ee5 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -33,7 +33,6 @@
#include <linux/seq_file.h>
#include <linux/cpu.h>
#include <linux/module.h>
-#include <linux/console.h>
#include <linux/tty.h>
#include <linux/ext2_fs.h>
@@ -175,6 +174,9 @@ void __init setup_arch(char **cmdline_p)
unsigned long mtd_phys = 0;
#endif
+#ifdef CONFIG_DUMMY_CONSOLE
+ conswitchp = &dummy_con;
+#endif
cclk = get_cclk();
sclk = get_sclk();
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
