diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-11-10 23:37:21 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-11-10 23:37:21 +0000 |
| commit | 65f69e5c16f8eee17b7f71bfad9e8e58f44c7386 (patch) | |
| tree | 0bfc3b13f311387b9fc12db2cb44fea3713d2708 /arch/arm/kernel | |
| parent | cc20d42986d5807cbe4f5c7c8e3dab2e59ea0db3 (diff) | |
| parent | c97c5aa83c41a532bc67da356d77da929bc41b9c (diff) | |
| download | linux-65f69e5c16f8eee17b7f71bfad9e8e58f44c7386.tar.gz linux-65f69e5c16f8eee17b7f71bfad9e8e58f44c7386.tar.bz2 linux-65f69e5c16f8eee17b7f71bfad9e8e58f44c7386.zip | |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/smp_scu.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/kernel/smp_scu.c b/arch/arm/kernel/smp_scu.c index d3831f616ee9..9ab4149bd983 100644 --- 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); |