summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2010-11-10 15:59:11 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-11-10 15:11:19 +0000
commite56c010f0d08bbecd05074eded7805d555da29b6 (patch)
treed3c12b12c6606845438ee57f521089679c28734b /arch
parent69448c2a4d23e5883cbca21a173e3eb89f095746 (diff)
downloadlinux-stable-e56c010f0d08bbecd05074eded7805d555da29b6.tar.gz
linux-stable-e56c010f0d08bbecd05074eded7805d555da29b6.tar.bz2
linux-stable-e56c010f0d08bbecd05074eded7805d555da29b6.zip
ARM: 6472/1: vexpress ct-ca9x4: only set twd_base if local timers are being used
In commit bde28b84, I made the assumption that CONFIG_SMP is always set for the quad-core ct-ca9x4 platform. As it turns out, people who aren't using the SMP goodness are confronted with a build failure. This patch fixes this issue by ensure that twd_base is only set if local timers are being used (and therefore SMP support is configured). Reported-by: Nicolas Pitre <nicolas.pitre@linaro.org> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-vexpress/ct-ca9x4.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c
index c2e405a9e025..fd25ccd7272f 100644
--- a/arch/arm/mach-vexpress/ct-ca9x4.c
+++ b/arch/arm/mach-vexpress/ct-ca9x4.c
@@ -54,7 +54,9 @@ static struct map_desc ct_ca9x4_io_desc[] __initdata = {
static void __init ct_ca9x4_map_io(void)
{
+#ifdef CONFIG_LOCAL_TIMERS
twd_base = MMIO_P2V(A9_MPCORE_TWD);
+#endif
v2m_map_io(ct_ca9x4_io_desc, ARRAY_SIZE(ct_ca9x4_io_desc));
}