diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-03-28 17:25:09 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-03-28 17:25:11 +1100 |
commit | 1c06b25346891b03249afb0c5c1dcf2d4af10442 (patch) | |
tree | 9c32b7b545d998c57a8c9b70b09d8e4ecf942eb6 /arch/arm64/kernel/early_printk.c | |
parent | 657af6b501a2511fb6bebcca0de3e4c1685186b6 (diff) | |
parent | dd2d4c7c315f7f6ef2ecff7ef4a646a7ae19d582 (diff) |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/arm64/kernel/early_printk.c')
-rw-r--r-- | arch/arm64/kernel/early_printk.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm64/kernel/early_printk.c b/arch/arm64/kernel/early_printk.c index fbb6e1843659..ffbbdde7aba1 100644 --- a/arch/arm64/kernel/early_printk.c +++ b/arch/arm64/kernel/early_printk.c @@ -26,6 +26,8 @@ #include <linux/amba/serial.h> #include <linux/serial_reg.h> +#include <asm/fixmap.h> + static void __iomem *early_base; static void (*printch)(char ch); @@ -141,8 +143,10 @@ static int __init setup_early_printk(char *buf) } /* no options parsing yet */ - if (paddr) - early_base = early_io_map(paddr, EARLYCON_IOBASE); + if (paddr) { + set_fixmap_io(FIX_EARLYCON_MEM_BASE, paddr); + early_base = (void __iomem *)fix_to_virt(FIX_EARLYCON_MEM_BASE); + } printch = match->printch; early_console = &early_console_dev; |