commit b6b1d87785712474d0ed80689c17107d616a1171
author Daniel Ritz <daniel.ritz-ml@swissonline.ch> Fri Aug 03 16:07:43 2007 +0200
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Fri Aug 03 15:02:56 2007 -0700
tree c0c1d90a82c58950db96456a9cfe2d8ad0b8d426
parent 1a3f2ea336b784d7df750a7821f514f3dea69e29

serial: fix 8250 early console setup

the early setup function serial8250_console_early_setup() can be called
from non __init code (eg. hotpluggable serial ports like serial_cs) so
remove the __init from the call chain to avoid crashes.

Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Cc: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

kernel/printk.c

diff --git a/kernel/printk.c b/kernel/printk.c
index 051d27e..bd2cd06 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -732,7 +732,7 @@
 	return 0;
 }
 
-int __init update_console_cmdline(char *name, int idx, char *name_new, int idx_new, char *options)
+int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, char *options)
 {
 	struct console_cmdline *c;
 	int i;