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

Commit d967b010 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: msm: avoid calling debug_ll_addr on !MMU 



MSM7X00A has an open-coded version of debug_ll_io_init so it
can use MT_DEVICE_NONSHARED as required by the platform.

However, this fails to build on no-MMU kernels because the
debug_ll_addr function is not available. Since the iotable_init
function doesn't actually do anyting in this configuration,
we can simply get away by enclosing the broken function call
in an #ifdef, which seems to be the least ugly workaround.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarDavid Brown <davidb@codeaurora.org>
Cc: Daniel Walker <dwalker@fifo99.com>
Cc: Bryan Huntsman <bryanh@codeaurora.org>
parent 404ed596

arch/arm/mach-msm/io.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -78,8 +78,10 @@ void __init msm_map_common_io(void) 
	asm("mcr p15, 0, %0, c15, c2, 4" : : "r" (0));

	asm("mcr p15, 0, %0, c15, c2, 4" : : "r" (0));

#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \

#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \

		defined(CONFIG_DEBUG_MSM_UART3)

		defined(CONFIG_DEBUG_MSM_UART3)

#ifdef CONFIG_MMU

	debug_ll_addr(&msm_io_desc[size - 1].pfn,

	debug_ll_addr(&msm_io_desc[size - 1].pfn,

		      &msm_io_desc[size - 1].virtual);

		      &msm_io_desc[size - 1].virtual);

#endif

	msm_io_desc[size - 1].pfn = __phys_to_pfn(msm_io_desc[size - 1].pfn);

	msm_io_desc[size - 1].pfn = __phys_to_pfn(msm_io_desc[size - 1].pfn);

#endif

#endif

	iotable_init(msm_io_desc, size);

	iotable_init(msm_io_desc, size);