diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-02-14 07:50:57 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-02-14 09:04:37 -0500 |
commit | 060fd1be0c720166091470ffb7846512b82c1a87 (patch) | |
tree | c54466248ee3f42b47befdd48bed4c2616b9f58d | |
parent | 29408ed963cc9839c742ed61b8e8e69bff431eb0 (diff) |
ARM: integrator/versatile: fix NOMMU warnings
On NOMMU kernels, the io_desc variables are unused
because we don't use the MMU to remap the MMIO
areas.
Marking these variables as __maybe_unused easily
avoids the otherwise harmless warnings like
warning: 'versatile_io_desc' defined but not used
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Russell King <linux@arm.linux.org.uk>
-rw-r--r-- | arch/arm/mach-integrator/integrator_ap.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-integrator/integrator_cp.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-versatile/core.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index 11e2a4145807..11b1d21f3c77 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c | |||
@@ -94,7 +94,7 @@ void __iomem *ap_syscon_base; | |||
94 | * f1b00000 1b000000 GPIO | 94 | * f1b00000 1b000000 GPIO |
95 | */ | 95 | */ |
96 | 96 | ||
97 | static struct map_desc ap_io_desc[] __initdata = { | 97 | static struct map_desc ap_io_desc[] __initdata __maybe_unused = { |
98 | { | 98 | { |
99 | .virtual = IO_ADDRESS(INTEGRATOR_HDR_BASE), | 99 | .virtual = IO_ADDRESS(INTEGRATOR_HDR_BASE), |
100 | .pfn = __phys_to_pfn(INTEGRATOR_HDR_BASE), | 100 | .pfn = __phys_to_pfn(INTEGRATOR_HDR_BASE), |
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 7322838c0447..01a888d7b0b8 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c | |||
@@ -78,7 +78,7 @@ static void __iomem *intcp_con_base; | |||
78 | * fcb00000 cb000000 CP system control | 78 | * fcb00000 cb000000 CP system control |
79 | */ | 79 | */ |
80 | 80 | ||
81 | static struct map_desc intcp_io_desc[] __initdata = { | 81 | static struct map_desc intcp_io_desc[] __initdata __maybe_unused = { |
82 | { | 82 | { |
83 | .virtual = IO_ADDRESS(INTEGRATOR_HDR_BASE), | 83 | .virtual = IO_ADDRESS(INTEGRATOR_HDR_BASE), |
84 | .pfn = __phys_to_pfn(INTEGRATOR_HDR_BASE), | 84 | .pfn = __phys_to_pfn(INTEGRATOR_HDR_BASE), |
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index 5d5929450366..60c092cfdae3 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c | |||
@@ -114,7 +114,7 @@ void __init versatile_init_irq(void) | |||
114 | writel(PIC_MASK, VA_SIC_BASE + SIC_INT_PIC_ENABLE); | 114 | writel(PIC_MASK, VA_SIC_BASE + SIC_INT_PIC_ENABLE); |
115 | } | 115 | } |
116 | 116 | ||
117 | static struct map_desc versatile_io_desc[] __initdata = { | 117 | static struct map_desc versatile_io_desc[] __initdata __maybe_unused = { |
118 | { | 118 | { |
119 | .virtual = IO_ADDRESS(VERSATILE_SYS_BASE), | 119 | .virtual = IO_ADDRESS(VERSATILE_SYS_BASE), |
120 | .pfn = __phys_to_pfn(VERSATILE_SYS_BASE), | 120 | .pfn = __phys_to_pfn(VERSATILE_SYS_BASE), |