diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-11-18 02:53:52 +0100 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-11-18 02:53:52 +0100 |
commit | 260af56271f79da0e37faa5a99b1786b221297e5 (patch) | |
tree | d76a2609f940b88083314d5f9131c73115bd4dcb /arch/arm/kernel/smp_scu.c | |
parent | sh: dma: Kill off bogus dma_sysclass symbol export. (diff) | |
parent | sh: Fixup last users of irq_chip->typename (diff) | |
download | linux-260af56271f79da0e37faa5a99b1786b221297e5.tar.xz linux-260af56271f79da0e37faa5a99b1786b221297e5.zip |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/arm/kernel/smp_scu.c')
-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); |