diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2010-01-18 20:42:39 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-18 20:42:39 +0900 |
| commit | 8faba6121566248330e738d25a2c43d7500fb9f0 (patch) | |
| tree | 9cb09b2ec00b504dd24e1272126a22cd365e7282 /arch/sh/kernel | |
| parent | sh: Need IRQs enabled for init_fpu(). (diff) | |
| parent | sh: Tidy up non-translatable checks in iounmap path. (diff) | |
| download | linux-dev-8faba6121566248330e738d25a2c43d7500fb9f0.tar.xz linux-dev-8faba6121566248330e738d25a2c43d7500fb9f0.zip | |
Merge branch 'sh/ioremap-fixed'
Diffstat (limited to 'arch/sh/kernel')
| -rw-r--r-- | arch/sh/kernel/setup.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index f79ebe32a24a..e187750dd319 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -449,14 +449,15 @@ void __init setup_arch(char **cmdline_p) #ifdef CONFIG_DUMMY_CONSOLE conswitchp = &dummy_con; #endif + paging_init(); + pmb_init(); + + ioremap_fixed_init(); /* Perform the machine specific initialisation */ if (likely(sh_mv.mv_setup)) sh_mv.mv_setup(cmdline_p); - paging_init(); - pmb_init(); - #ifdef CONFIG_SMP plat_smp_setup(); #endif |