Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 060fd1be authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Russell King <linux@arm.linux.org.uk>
parent 29408ed9

arch/arm/mach-integrator/integrator_ap.c

+1 −1
Original line number Diff line number Diff line
@@ -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),

arch/arm/mach-integrator/integrator_cp.c

+1 −1
Original line number Diff line number Diff line
@@ -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),

arch/arm/mach-versatile/core.c

+1 −1
Original line number Diff line number Diff line
@@ -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),