arm64 non-SMP build error in latest upstream kernel

[Guenter Roeck]

Configuration: arm64 defconfig, -SMP

Error:

In file included from ./arch/arm64/include/asm/irq_work.h:4:0,
                 from include/linux/irq_work.h:46,
                 from include/linux/perf_event.h:49,
                 from include/linux/hw_breakpoint.h:4,
                 from arch/arm64/kernel/process.c:43:
./arch/arm64/include/asm/smp.h:24:3: error: #error "<asm/smp.h> included in non-SMP build"
 # error "<asm/smp.h> included in non-SMP build"
   ^
./arch/arm64/include/asm/smp.h:27:0: warning: "raw_smp_processor_id" redefined [enabled by default]
 #define raw_smp_processor_id() (current_thread_info()->cpu)
 ^
In file included from include/linux/sched.h:34:0,
                 from ./arch/arm64/include/asm/compat.h:25,
                 from ./arch/arm64/include/asm/stat.h:23,
                 from include/linux/stat.h:5,
                 from include/linux/compat.h:10,
                 from arch/arm64/kernel/process.c:23:
include/linux/smp.h:129:0: note: this is the location of the previous definition
 #define raw_smp_processor_id()   0

This is just one example; the error is seen multiple times.

Let me know if you need me to bisect.

Guenter