Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6

2009-11-10 23:37:21 +00:00
parent cc20d42986 c97c5aa83c
commit 65f69e5c16
12 changed files with 146 additions and 9 deletions
--- a/arch/arm/kernel/smp_scu.c
+++ b/arch/arm/kernel/smp_scu.c
@@ -37,6 +37,10 @@ void __init scu_enable(void __iomem *scu_base)
 	u32 scu_ctrl;

 	scu_ctrl = __raw_readl(scu_base + SCU_CTRL);
+	/* already enabled? */
+	if (scu_ctrl & 1)
+		return;
+
 	scu_ctrl |= 1;
 	__raw_writel(scu_ctrl, scu_base + SCU_CTRL);