diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-16 20:57:29 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-21 18:23:31 +0100 |
| commit | d967b0100f8d99480487bce8ead1e0c3affdc511 (patch) | |
| tree | 4c6a125338730e85a0cfbdb443a721cadd40a1da /arch | |
| parent | 404ed596de6fa3a43416c823fb8ab2ba0e7a1772 (diff) | |
| download | linux-stable-d967b0100f8d99480487bce8ead1e0c3affdc511.tar.gz linux-stable-d967b0100f8d99480487bce8ead1e0c3affdc511.tar.bz2 linux-stable-d967b0100f8d99480487bce8ead1e0c3affdc511.zip | |
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 <arnd@arndb.de>
Acked-by: David Brown <davidb@codeaurora.org>
Cc: Daniel Walker <dwalker@fifo99.com>
Cc: Bryan Huntsman <bryanh@codeaurora.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-msm/io.c | 2 |
1 files changed, 2 insertions, 0 deletions
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); |