---

yaml --- r: 168514 b: refs/heads/master c: 9b229fa h: refs/heads/master v: v3
git-mirror · Nov 5, 2009 · 8d6fb8e · 8d6fb8e
1 parent 85e770d
commit 8d6fb8e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b3a02eb452354fa9b36a7f33dc4c8307bbc40aa
+refs/heads/master: 9b229fa0951fb47cbc178be4bd8e9ef185b38802
diff --git a/trunk/arch/arm/kernel/smp_scu.c b/trunk/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);