path: root/kernel/printk.c
diff options
authorDavid S. Miller <davem@davemloft.net>2007-12-29 01:19:49 -0800
committerDavid S. Miller <davem@davemloft.net>2007-12-29 01:19:49 -0800
commitfb445ee5f9bfc7cbef9e397556170c608dc02955 (patch)
treeb1a478362ad1a147c4d2c06ef79f77225953ce99 /kernel/printk.c
parent1842c7f260dd24dad2dd8eded80904d7a6c5525f (diff)
[SERIAL]: Fix section mismatches in Sun serial console drivers.
We're exporting an __init function, oops :-) The core issue here is that add_preferred_console() is marked as __init, this makes it impossible to invoke this thing from a driver probe routine which is what the Sparc serial drivers need to do. There is no harm in dropping the __init marker. This code will actually work properly when invoked from a modular driver, except that init will probably not pick up the console change without some other support code. Then we can drop the __init from sunserial_console_match() and we're no longer exporting an __init function to modules. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/printk.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/printk.c b/kernel/printk.c
index a30fe33de39..89011bf8c10 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -817,7 +817,7 @@ __setup("console=", console_setup);
* commonly to provide a default console (ie from PROM variables) when
* the user has not supplied one.
-int __init add_preferred_console(char *name, int idx, char *options)
+int add_preferred_console(char *name, int idx, char *options)
struct console_cmdline *c;
int i;