From: Arnd Bergmann Date: Sun, 16 Mar 2014 19:57:29 +0000 (+0100) Subject: ARM: msm: avoid calling debug_ll_addr on !MMU X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d967b0100f8d99480487bce8ead1e0c3affdc511;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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: Arnd Bergmann Acked-by: David Brown Cc: Daniel Walker Cc: Bryan Huntsman --- diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c index adc8971c7266..34e09474636d 100644 --- a/arch/arm/mach-msm/io.c +++ b/arch/arm/mach-msm/io.c @@ -78,8 +78,10 @@ void __init msm_map_common_io(void) asm("mcr p15, 0, %0, c15, c2, 4" : : "r" (0)); #if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \ defined(CONFIG_DEBUG_MSM_UART3) +#ifdef CONFIG_MMU debug_ll_addr(&msm_io_desc[size - 1].pfn, &msm_io_desc[size - 1].virtual); +#endif msm_io_desc[size - 1].pfn = __phys_to_pfn(msm_io_desc[size - 1].pfn); #endif iotable_init(msm_io_desc, size);