]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
ARM: integrator/versatile: fix NOMMU warnings
authorArnd Bergmann <arnd@arndb.de>
Thu, 14 Feb 2013 12:50:57 +0000 (13:50 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 14 Feb 2013 14:04:37 +0000 (15:04 +0100)
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>
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-integrator/integrator_cp.c
arch/arm/mach-versatile/core.c

index 11e2a4145807876b79883fe4c0a45a76ba42a693..11b1d21f3c776c8036c93dd8aabe40ad32733282 100644 (file)
@@ -94,7 +94,7 @@ void __iomem *ap_syscon_base;
  * f1b00000    1b000000        GPIO
  */
 
-static struct map_desc ap_io_desc[] __initdata = {
+static struct map_desc ap_io_desc[] __initdata __maybe_unused = {
        {
                .virtual        = IO_ADDRESS(INTEGRATOR_HDR_BASE),
                .pfn            = __phys_to_pfn(INTEGRATOR_HDR_BASE),
index 7322838c0447dabe3c29d7b5b703af5d49771f31..01a888d7b0b85fec94d4bf019c4110c9371cb6ca 100644 (file)
@@ -78,7 +78,7 @@ static void __iomem *intcp_con_base;
  * fcb00000    cb000000        CP system control
  */
 
-static struct map_desc intcp_io_desc[] __initdata = {
+static struct map_desc intcp_io_desc[] __initdata __maybe_unused = {
        {
                .virtual        = IO_ADDRESS(INTEGRATOR_HDR_BASE),
                .pfn            = __phys_to_pfn(INTEGRATOR_HDR_BASE),
index 5d5929450366a894aa2abea0ecee82113c75ac67..60c092cfdae3a9322d80aecad31a85b4d125319a 100644 (file)
@@ -114,7 +114,7 @@ void __init versatile_init_irq(void)
        writel(PIC_MASK, VA_SIC_BASE + SIC_INT_PIC_ENABLE);
 }
 
-static struct map_desc versatile_io_desc[] __initdata = {
+static struct map_desc versatile_io_desc[] __initdata __maybe_unused = {
        {
                .virtual        =  IO_ADDRESS(VERSATILE_SYS_BASE),
                .pfn            = __phys_to_pfn(VERSATILE_SYS_BASE),