diff options
author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2013-02-11 15:51:49 -0500 |
---|---|---|
committer | John Crispin <blogic@openwrt.org> | 2013-02-19 03:36:37 -0500 |
commit | f7be4e754b61681467f873400cbaa42a013b8973 (patch) | |
tree | a69c286445484802127aaf6552755e53867229c3 /arch/mips/bcm63xx | |
parent | 1e7decdb27ae89b2a0626635a8cf527f930bff1c (diff) |
MIPS: early_printk: drop __init annotations
We cannot use __init for earlyprintk code or data, since the kernel
parameter "keep_bootcon" allows leaving the boot console enabled.
Currently MIPS will crash/hang/die if you use keep_bootcon. The patch
fixes it at least on Lemote FuLoong mini-PC. Changes for other boards
were done based on what I could find with grep...
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Patchwork: http://patchwork.linux-mips.org/patch/4935/
Signed-off-by: John Crispin <blogic@openwrt.org>
Diffstat (limited to 'arch/mips/bcm63xx')
-rw-r--r-- | arch/mips/bcm63xx/early_printk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/bcm63xx/early_printk.c b/arch/mips/bcm63xx/early_printk.c index bf353c937df2..aa8f7f9cc7a4 100644 --- a/arch/mips/bcm63xx/early_printk.c +++ b/arch/mips/bcm63xx/early_printk.c | |||
@@ -10,7 +10,7 @@ | |||
10 | #include <bcm63xx_io.h> | 10 | #include <bcm63xx_io.h> |
11 | #include <bcm63xx_regs.h> | 11 | #include <bcm63xx_regs.h> |
12 | 12 | ||
13 | static void __init wait_xfered(void) | 13 | static void wait_xfered(void) |
14 | { | 14 | { |
15 | unsigned int val; | 15 | unsigned int val; |
16 | 16 | ||
@@ -22,7 +22,7 @@ static void __init wait_xfered(void) | |||
22 | } while (1); | 22 | } while (1); |
23 | } | 23 | } |
24 | 24 | ||
25 | void __init prom_putchar(char c) | 25 | void prom_putchar(char c) |
26 | { | 26 | { |
27 | wait_xfered(); | 27 | wait_xfered(); |
28 | bcm_uart0_writel(c, UART_FIFO_REG); | 28 | bcm_uart0_writel(c, UART_FIFO_REG); |