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

Commit e3d9c625 authored by Russell King's avatar Russell King
Browse files

ARM: CPU hotplug: fix hard-coded control register constants 



Use the definition we've provided in asm/system.h rather than
numeric constants.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent e9882777

arch/arm/mach-realview/hotplug.c

+4 −4
Original line number Diff line number Diff line
@@ -31,10 +31,10 @@ static inline void cpu_enter_lowpower(void) 
	"	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)

	  : "r" (0), "Ir" (CR_C)

	  : "cc");

}
@@ -43,13 +43,13 @@ static inline void cpu_leave_lowpower(void) 
	unsigned int v;



	asm volatile(	"mrc	p15, 0, %0, c1, c0, 0\n"

	"	orr	%0, %0, #0x04\n"

	"	orr	%0, %0, %1\n"

	"	mcr	p15, 0, %0, c1, c0, 0\n"

	"	mrc	p15, 0, %0, c1, c0, 1\n"

	"	orr	%0, %0, #0x20\n"

	"	mcr	p15, 0, %0, c1, c0, 1\n"

	  : "=&r" (v)

	  :

	  : "Ir" (CR_C)

	  : "cc");

}

arch/arm/mach-s5pv310/hotplug.c

+4 −4
Original line number Diff line number Diff line
@@ -30,13 +30,13 @@ static inline void cpu_enter_lowpower(void) 
	 * Turn off coherency

	 */

	"	mrc	p15, 0, %0, c1, c0, 1\n"

	"	bic	%0, %0, #0x20\n"

	"	bic	%0, %0, %2\n"

	"	mcr	p15, 0, %0, c1, c0, 1\n"

	"	mrc	p15, 0, %0, c1, c0, 0\n"

	"	bic	%0, %0, #0x04\n"

	"	mcr	p15, 0, %0, c1, c0, 0\n"

	  : "=&r" (v)

	  : "r" (0)

	  : "r" (0), "Ir" (CR_C)

	  : "cc");

}
@@ -46,13 +46,13 @@ static inline void cpu_leave_lowpower(void) 


	asm volatile(

	"mrc	p15, 0, %0, c1, c0, 0\n"

	"	orr	%0, %0, #0x04\n"

	"	orr	%0, %0, %1\n"

	"	mcr	p15, 0, %0, c1, c0, 0\n"

	"	mrc	p15, 0, %0, c1, c0, 1\n"

	"	orr	%0, %0, #0x20\n"

	"	mcr	p15, 0, %0, c1, c0, 1\n"

	  : "=&r" (v)

	  :

	  : "Ir" (CR_C)

	  : "cc");

}

arch/arm/mach-tegra/hotplug.c

+4 −4
Original line number Diff line number Diff line
@@ -26,13 +26,13 @@ static inline void cpu_enter_lowpower(void) 
	 * Turn off coherency

	 */

	"	mrc	p15, 0, %0, c1, c0, 1\n"

	"	bic	%0, %0, #0x20\n"

	"	bic	%0, %0, %2\n"

	"	mcr	p15, 0, %0, c1, c0, 1\n"

	"	mrc	p15, 0, %0, c1, c0, 0\n"

	"	bic	%0, %0, #0x04\n"

	"	mcr	p15, 0, %0, c1, c0, 0\n"

	  : "=&r" (v)

	  : "r" (0)

	  : "r" (0), "Ir" (CR_C)

	  : "cc");

}
@@ -42,13 +42,13 @@ static inline void cpu_leave_lowpower(void) 


	asm volatile(

	"mrc	p15, 0, %0, c1, c0, 0\n"

	"	orr	%0, %0, #0x04\n"

	"	orr	%0, %0, %1\n"

	"	mcr	p15, 0, %0, c1, c0, 0\n"

	"	mrc	p15, 0, %0, c1, c0, 1\n"

	"	orr	%0, %0, #0x20\n"

	"	mcr	p15, 0, %0, c1, c0, 1\n"

	  : "=&r" (v)

	  :

	  : "Ir" (CR_C)

	  : "cc");

}