Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30b99d07 authored by Russell King's avatar Russell King
Browse files

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: default avatarviresh kumar <viresh.kumar@st.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4d2692a7

arch/arm/mach-s5pv310/hotplug.c

+2 −2
Original line number Diff line number Diff line
@@ -30,10 +30,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)

arch/arm/mach-tegra/hotplug.c

+2 −2
Original line number Diff line number Diff line
@@ -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)