| From ceab3fe69408cb98f437dad3b4b4bb79434370ef Mon Sep 17 00:00:00 2001 |
| From: Catalin Marinas <catalin.marinas@arm.com> |
| Date: Tue, 21 Oct 2014 17:01:07 +0100 |
| Subject: arm64: Fix compilation error on UP builds |
| |
| From: Catalin Marinas <catalin.marinas@arm.com> |
| |
| commit ceab3fe69408cb98f437dad3b4b4bb79434370ef upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/arm64/include/asm/irq_work.h | 11 +++++++++++ |
| 1 file changed, 11 insertions(+) |
| |
| --- 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_int |
| return !!__smp_cross_call; |
| } |
| |
| +#else |
| + |
| +static inline bool arch_irq_work_has_interrupt(void) |
| +{ |
| + return false; |
| +} |
| + |
| +#endif |
| + |
| #endif /* __ASM_IRQ_WORK_H */ |
