diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-14 13:06:26 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-14 13:06:26 +0100 |
commit | 30b99d07b7e08d0e6bcc2f0b924828c03e67f881 (patch) | |
tree | 086c98a4badbce07f06df525041a7c98dba35ee1 /arch/arm/mach-tegra/hotplug.c | |
parent | ARM: 6624/1: fix dependency for CONFIG_SMP_ON_UP (diff) | |
download | linux-30b99d07b7e08d0e6bcc2f0b924828c03e67f881.tar.xz linux-30b99d07b7e08d0e6bcc2f0b924828c03e67f881.zip |
ARM: fix wrongly patched constants
e3d9c625 (ARM: CPU hotplug: fix hard-coded control register constants)
changed the wrong constants in the hotplug assembly code. Fix this.
Reported-by: viresh kumar <viresh.kumar@st.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-tegra/hotplug.c')
-rw-r--r-- | arch/arm/mach-tegra/hotplug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/hotplug.c b/arch/arm/mach-tegra/hotplug.c index a5cb1ce76ff2..f3294040d357 100644 --- a/arch/arm/mach-tegra/hotplug.c +++ b/arch/arm/mach-tegra/hotplug.c @@ -26,10 +26,10 @@ static inline void cpu_enter_lowpower(void) * Turn off coherency */ " mrc p15, 0, %0, c1, c0, 1\n" - " bic %0, %0, %2\n" + " bic %0, %0, #0x20\n" " mcr p15, 0, %0, c1, c0, 1\n" " mrc p15, 0, %0, c1, c0, 0\n" - " bic %0, %0, #0x04\n" + " bic %0, %0, %2\n" " mcr p15, 0, %0, c1, c0, 0\n" : "=&r" (v) : "r" (0), "Ir" (CR_C) |