diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-05-27 03:40:20 (GMT) |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-05-27 03:40:20 (GMT) |
commit | 3feab0fd372fc656992d649734fe316261c51704 (patch) | |
tree | e0feb86ca0b979ab11ce9baa1d0d0956ae4dfb07 /arch/arm64/include | |
parent | 6203c45e33f058f4c766b09cb05fdc9ee7d173de (diff) | |
parent | f2082852632e850bb15e9985a833d87b7455d731 (diff) | |
download | linux-3feab0fd372fc656992d649734fe316261c51704.tar.xz |
Merge branch 'v4.9/topic/PANemulation' into linux-linaro-lsk-v4.9
Diffstat (limited to 'arch/arm64/include')
-rw-r--r-- | arch/arm64/include/asm/smp.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/smp.h b/arch/arm64/include/asm/smp.h index a62db95..d050d72 100644 --- a/arch/arm64/include/asm/smp.h +++ b/arch/arm64/include/asm/smp.h @@ -41,8 +41,10 @@ DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number); * We don't use this_cpu_read(cpu_number) as that has implicit writes to * preempt_count, and associated (compiler) barriers, that we'd like to avoid * the expense of. If we're preemptible, the value can be stale at use anyway. + * And we can't use this_cpu_ptr() either, as that winds up recursing back + * here under CONFIG_DEBUG_PREEMPT=y. */ -#define raw_smp_processor_id() (*this_cpu_ptr(&cpu_number)) +#define raw_smp_processor_id() (*raw_cpu_ptr(&cpu_number)) struct seq_file; |