diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-23 20:36:05 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-23 20:36:05 +0000 |
| commit | 15f82fce54b86e159fe5a1d41dcdc89e12b26459 (patch) | |
| tree | c42632581244e8428e0623c5f11cd81b983d2eed /arch/arm64/include/asm/percpu.h | |
| parent | f1326e0892329b0d58dec467f71f5d94c4d5d5a9 (diff) | |
| parent | 9698ac7c353d6f22100c9fa24a830cae6a466cb4 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsklsk-v3.10-15.01
Conflicts:
arch/arm64/include/asm/proc-fns.h
arch/arm64/kernel/debug-monitors.c
arch/arm64/kernel/psci.c
Diffstat (limited to 'arch/arm64/include/asm/percpu.h')
| -rw-r--r-- | arch/arm64/include/asm/percpu.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/percpu.h b/arch/arm64/include/asm/percpu.h index 453a179469a3..5279e5733386 100644 --- a/arch/arm64/include/asm/percpu.h +++ b/arch/arm64/include/asm/percpu.h @@ -26,13 +26,13 @@ static inline void set_my_cpu_offset(unsigned long off) static inline unsigned long __my_cpu_offset(void) { unsigned long off; - register unsigned long *sp asm ("sp"); /* * We want to allow caching the value, so avoid using volatile and * instead use a fake stack read to hazard against barrier(). */ - asm("mrs %0, tpidr_el1" : "=r" (off) : "Q" (*sp)); + asm("mrs %0, tpidr_el1" : "=r" (off) : + "Q" (*(const unsigned long *)current_stack_pointer)); return off; } |