diff options
author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2013-02-11 20:51:49 +0000 |
---|---|---|
committer | John Crispin <blogic@openwrt.org> | 2013-02-19 09:36:37 +0100 |
commit | f7be4e754b61681467f873400cbaa42a013b8973 (patch) | |
tree | a69c286445484802127aaf6552755e53867229c3 /arch/mips/bcm63xx | |
parent | 1e7decdb27ae89b2a0626635a8cf527f930bff1c (diff) | |
download | talos-obmc-linux-f7be4e754b61681467f873400cbaa42a013b8973.tar.gz talos-obmc-linux-f7be4e754b61681467f873400cbaa42a013b8973.zip |
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 @@ #include <bcm63xx_io.h> #include <bcm63xx_regs.h> -static void __init wait_xfered(void) +static void wait_xfered(void) { unsigned int val; @@ -22,7 +22,7 @@ static void __init wait_xfered(void) } while (1); } -void __init prom_putchar(char c) +void prom_putchar(char c) { wait_xfered(); bcm_uart0_writel(c, UART_FIFO_REG); |