Skip to contentSkip to conversation

ARM: vexpress ct-ca9x4: only set twd_base if local timers are being used

PATCH New Will Deacon 2 participants 4 messages Nov 4, 2010 – Mar 1, 2011

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm/versatile express platform
lore
Share & tools
lore

Will Deacon

author
#0 lore raw

PATCH 1/1 ARM: 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 <[email protected]>
Signed-off-by Will Deacon <[email protected]>
---
 arch/arm/mach-vexpress/ct-ca9x4.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
arch/arm/mach-vexpress/ct-ca9x4.c +2 -0
index c2e405a..fd25ccd 100644
@@ -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));
 }
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 1/1 ARM: vexpress ct-ca9x4: only set twd_base if local timers are being used

Hello.

Quoted 1 line · Will Deacon

In commit bde28b84, I made the assumption that CONFIG_SMP is always set

Linus asks to also specify the commit summary in parens.

Quoted 8 lines

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 <[email protected]>
Signed-off-by Will Deacon <[email protected]>

WBR, Sergei

author
#2 lore raw

PATCH 1/1 ARM: vexpress ct-ca9x4: only set twd_base if local timers are being used

Quoted 5 lines
Quoted 1 line · Will Deacon

In commit bde28b84, I made the assumption that CONFIG_SMP is always set

Linus asks to also specify the commit summary in parens.

Well he merged it for v2.6.37 so I guess it's not the end of the world.

Will

#3 lore raw

PATCH 1/1 ARM: vexpress ct-ca9x4: only set twd_base if local timers are being used

Hello.

Quoted 4 lines · Will Deacon
Quoted 2 lines
Quoted 1 line

In commit bde28b84, I made the assumption that CONFIG_SMP is always set

Linus asks to also specify the commit summary in parens.

Well he merged it for v2.6.37 so I guess it's not the end of the world.

Heh, didn't realize I was replying to such an old email. :-)

Quoted 1 line

Will

WBR, Sergei