diff options
author | Catalin Marinas <catalin.marinas@arm.com> | 2014-10-21 18:01:07 +0200 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2014-10-21 18:01:07 +0200 |
commit | ceab3fe69408cb98f437dad3b4b4bb79434370ef (patch) | |
tree | c80d33d4b39e661c354e52b8fda8d5d84a596d7a | |
parent | Documentation/arm64/memory.txt: fix typo (diff) | |
download | linux-ceab3fe69408cb98f437dad3b4b4bb79434370ef.tar.xz linux-ceab3fe69408cb98f437dad3b4b4bb79434370ef.zip |
arm64: Fix compilation error on UP builds
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/ftrace_event.h:9,
from include/trace/syscall.h:6,
from include/linux/syscalls.h:81,
from init/main.c:18:
./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"
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Fixes: 3631073659d0 ("arm64: Tell irq work about self IPI support")
Reported-by: Guenter Roeck <linux@roeck-us.net>
Tested-by: Guenter Roeck <linux@roeck-us.net>
-rw-r--r-- | arch/arm64/include/asm/irq_work.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/irq_work.h b/arch/arm64/include/asm/irq_work.h index 8e24ef3f7c82..b4f6b19a8a68 100644 --- a/arch/arm64/include/asm/irq_work.h +++ b/arch/arm64/include/asm/irq_work.h @@ -1,6 +1,8 @@ #ifndef __ASM_IRQ_WORK_H #define __ASM_IRQ_WORK_H +#ifdef CONFIG_SMP + #include <asm/smp.h> static inline bool arch_irq_work_has_interrupt(void) @@ -8,4 +10,13 @@ static inline bool arch_irq_work_has_interrupt(void) return !!__smp_cross_call; } +#else + +static inline bool arch_irq_work_has_interrupt(void) +{ + return false; +} + +#endif + #endif /* __ASM_IRQ_WORK_H */ |