aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/mmu.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-06-01 01:08:11 -0400
committerOlof Johansson <olof@lixom.net>2013-06-01 01:08:11 -0400
commitb0d2804789bfe259841365e152c1234bd5642dc6 (patch)
tree0fe5db27a3cb1ffb65862ce19b654b46376bd818 /arch/arm/mm/mmu.c
parentb891e30e55c4d47d6b3c4de1b4f89e7683104c93 (diff)
parent442f15083eb25229fb95820bced8bea70298a34b (diff)
Merge tag 'arm-soc-cleanups-for-3.11' of git://github.com/mripard/linux into next/cleanup
From Maxime Ripard: Cleanups in various machine definitions - Patches to remove the .init_irq definition when using irqchip_init - Make the ARM core code call debug_ll_io_init when no map_io callback is declared - Remove the .map_io definition in the various machines using it (Some of these go through the platform maintainers, these are the ones who got explicitly acked and not picked up by anyone else) Signed-off-by: Olof Johansson <olof@lixom.net> * tag 'arm-soc-cleanups-for-3.11' of git://github.com/mripard/linux: ARM: sunxi: Remove the .map_io function declaration ARM: mxs: remove the .map_io declaration ARM: highbank: remove the .map_io declaration ARM: mmu: Call debug_ll_io_init if no map_io function is specified ARM: vt8500: Remove init_irq declaration in machine description ARM: virt: Remove init_irq declaration in machine description ARM: vexpress: Remove init_irq declaration in machine description ARM: sirf: Remove init_irq declaration in machine description ARM: spear: Remove init_irq declaration in machine description ARM: nomadik: Remove init_irq declaration in machine description
Diffstat (limited to 'arch/arm/mm/mmu.c')
-rw-r--r--arch/arm/mm/mmu.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index e0d8565671a6..faa36d7b8786 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -1232,6 +1232,8 @@ static void __init devicemaps_init(struct machine_desc *mdesc)
1232 */ 1232 */
1233 if (mdesc->map_io) 1233 if (mdesc->map_io)
1234 mdesc->map_io(); 1234 mdesc->map_io();
1235 else
1236 debug_ll_io_init();
1235 fill_pmd_gaps(); 1237 fill_pmd_gaps();
1236 1238
1237 /* Reserve fixed i/o space in VMALLOC region */ 1239 /* Reserve fixed i/o space in VMALLOC region */