Commit c0691143 authored by David Daney's avatar David Daney Committed by Linus Torvalds

mn10300: Fix include dependency in irqflags.h et al.

We need to pick up the definition of raw_smp_processor_id() from
asm/smp.h.  For the !SMP case, we need to supply a definition of
raw_smp_processor_id().

Because of the include dependencies we cannot use smp_call_func_t in
asm/smp.h, but we do need linux/thread_info.h
Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b9e763cd
...@@ -13,9 +13,8 @@ ...@@ -13,9 +13,8 @@
#define _ASM_IRQFLAGS_H #define _ASM_IRQFLAGS_H
#include <asm/cpu-regs.h> #include <asm/cpu-regs.h>
#ifndef __ASSEMBLY__ /* linux/smp.h <- linux/irqflags.h needs asm/smp.h first */
#include <linux/smp.h> #include <asm/smp.h>
#endif
/* /*
* interrupt control * interrupt control
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <linux/threads.h> #include <linux/threads.h>
#include <linux/cpumask.h> #include <linux/cpumask.h>
#include <linux/thread_info.h>
#endif #endif
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
...@@ -85,7 +86,7 @@ extern cpumask_t cpu_boot_map; ...@@ -85,7 +86,7 @@ extern cpumask_t cpu_boot_map;
extern void smp_init_cpus(void); extern void smp_init_cpus(void);
extern void smp_cache_interrupt(void); extern void smp_cache_interrupt(void);
extern void send_IPI_allbutself(int irq); extern void send_IPI_allbutself(int irq);
extern int smp_nmi_call_function(smp_call_func_t func, void *info, int wait); extern int smp_nmi_call_function(void (*func)(void *), void *info, int wait);
extern void arch_send_call_function_single_ipi(int cpu); extern void arch_send_call_function_single_ipi(int cpu);
extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);
...@@ -100,6 +101,7 @@ extern void __cpu_die(unsigned int cpu); ...@@ -100,6 +101,7 @@ extern void __cpu_die(unsigned int cpu);
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
static inline void smp_init_cpus(void) {} static inline void smp_init_cpus(void) {}
#define raw_smp_processor_id() 0
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* CONFIG_SMP */ #endif /* CONFIG_SMP */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment