diff options
| author | John Crispin <john@openwrt.org> | 2016-03-20 14:41:29 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2016-03-20 14:41:29 +0000 |
| commit | e9db6eb8b2c630b912c5ebf733eb39a4b38c0c57 (patch) | |
| tree | e52989a15106d085bf434af59fd6db1c639d02ab /target/linux/oxnas/files | |
| parent | b64f159bc8d94d5554792f46aacdad4d5bf643ca (diff) | |
| download | upstream-e9db6eb8b2c630b912c5ebf733eb39a4b38c0c57.tar.gz upstream-e9db6eb8b2c630b912c5ebf733eb39a4b38c0c57.tar.bz2 upstream-e9db6eb8b2c630b912c5ebf733eb39a4b38c0c57.zip | |
oxnas: sync cpu-hotplug with mach-realview
Make mach-oxnas/hotplug.c look more similar to mach-realview/hotplug.c,
just cosmetics and maintainability concerns, no functional changes.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
SVN-Revision: 49044
Diffstat (limited to 'target/linux/oxnas/files')
| -rw-r--r-- | target/linux/oxnas/files/arch/arm/mach-oxnas/hotplug.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/target/linux/oxnas/files/arch/arm/mach-oxnas/hotplug.c b/target/linux/oxnas/files/arch/arm/mach-oxnas/hotplug.c index 861beee7b3..e3c9cb5db7 100644 --- a/target/linux/oxnas/files/arch/arm/mach-oxnas/hotplug.c +++ b/target/linux/oxnas/files/arch/arm/mach-oxnas/hotplug.c @@ -14,7 +14,6 @@ #include <asm/cp15.h> #include <asm/smp_plat.h> -#include <mach/smp.h> static inline void cpu_enter_lowpower(void) { @@ -41,7 +40,7 @@ static inline void cpu_leave_lowpower(void) { unsigned int v; - asm volatile("mrc p15, 0, %0, c1, c0, 0\n" + asm volatile( "mrc p15, 0, %0, c1, c0, 0\n" " orr %0, %0, %1\n" " mcr p15, 0, %0, c1, c0, 0\n" " mrc p15, 0, %0, c1, c0, 1\n" @@ -68,7 +67,7 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious) : : "memory", "cc"); - if (read_pen_release() == cpu_logical_map(cpu)) { + if (pen_release == cpu_logical_map(cpu)) { /* * OK, proper wakeup, we're done */ @@ -91,7 +90,7 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious) * * Called with IRQs disabled */ -void __ref ox820_cpu_die(unsigned int cpu) +void ox820_cpu_die(unsigned int cpu) { int spurious = 0; |