diff options
| author | Rob Herring | 2012-03-10 21:24:04 -0600 |
|---|---|---|
| committer | Rob Herring | 2012-03-11 15:59:13 -0500 |
| commit | 8a2b6255dd11eee1b27d1be394241abf1871b610 (patch) | |
| tree | 176fe3a486861176d8dbc73adecb6809528f65b7 | |
| parent | 5621caac1d9514b568f986b55ce5494b1d119d40 (diff) | |
ARM: fix ioremap/iounmap for !CONFIG_MMU
With commit 4fe7ef3a081 (ARM: provide runtime hook for ioremap/iounmap),
compiles with !CONFIG_MMU were broken. Rename nommu __iounmap to
__arm_iounmap and add arch_ioremap_caller and arch_iounmap. Its
not expected that these need to be overriden for !CONFIG_MMU, so setting
the function ptrs has no effect in this case.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Russell King <linux@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mm/nommu.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c index 4fc6794cca4b..6486d2f253cd 100644 --- a/arch/arm/mm/nommu.c +++ b/arch/arm/mm/nommu.c @@ -86,13 +86,17 @@ void __iomem *__arm_ioremap(unsigned long phys_addr, size_t size, } EXPORT_SYMBOL(__arm_ioremap); +void __iomem * (*arch_ioremap_caller)(unsigned long, size_t, unsigned int, void *); + void __iomem *__arm_ioremap_caller(unsigned long phys_addr, size_t size, unsigned int mtype, void *caller) { return __arm_ioremap(phys_addr, size, mtype); } -void __iounmap(volatile void __iomem *addr) +void (*arch_iounmap)(volatile void __iomem *); + +void __arm_iounmap(volatile void __iomem *addr) { } -EXPORT_SYMBOL(__iounmap); +EXPORT_SYMBOL(__arm_iounmap); |