summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-berlin
diff options
context:
space:
mode:
authorAfzal Mohammed <afzal.mohd.ma@gmail.com>2017-01-29 17:31:32 +0100
committerRussell King <rmk+kernel@armlinux.org.uk>2017-02-28 12:06:12 +0100
commitd2ca5f2491c1246adf3847101fdc538a3b89439c (patch)
tree0657168ff0f464732cbfe8605b00e0e62f390a08 /arch/arm/mach-berlin
parentARM: 8644/1: Reduce "CPU: shutdown" message to debug level (diff)
downloadlinux-d2ca5f2491c1246adf3847101fdc538a3b89439c.tar.xz
linux-d2ca5f2491c1246adf3847101fdc538a3b89439c.zip
ARM: 8646/1: mmu: decouple VECTORS_BASE from Kconfig
For MMU configurations, VECTORS_BASE is always 0xffff0000, a macro definition will suffice. For no-MMU, exception base address is dynamically determined in subsequent patches. To preserve bisectability, now make the macro applicable for no-MMU scenario too. Thanks to 0-DAY kernel test infrastructure that found the bisectability issue. This macro will be restricted to MMU case upon dynamically determining exception base address for no-MMU. Once exception address is handled dynamically for no-MMU, VECTORS_BASE can be removed from Kconfig. Signed-off-by: afzal mohammed <afzal.mohd.ma@gmail.com> Tested-by: Vladimir Murzin <vladimir.murzin@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-berlin')
-rw-r--r--arch/arm/mach-berlin/platsmp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-berlin/platsmp.c b/arch/arm/mach-berlin/platsmp.c
index 1167b0ed92c8..7586b7aec272 100644
--- a/arch/arm/mach-berlin/platsmp.c
+++ b/arch/arm/mach-berlin/platsmp.c
@@ -15,6 +15,7 @@
#include <asm/cacheflush.h>
#include <asm/cp15.h>
+#include <asm/memory.h>
#include <asm/smp_plat.h>
#include <asm/smp_scu.h>
@@ -75,7 +76,7 @@ static void __init berlin_smp_prepare_cpus(unsigned int max_cpus)
if (!cpu_ctrl)
goto unmap_scu;
- vectors_base = ioremap(CONFIG_VECTORS_BASE, SZ_32K);
+ vectors_base = ioremap(VECTORS_BASE, SZ_32K);
if (!vectors_base)
goto unmap_scu;