tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: David Daney <david.daney@cavium.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

David Daney and committed by
Linus Torvalds c0691143 b9e763cd

+5 -4
+2 -3
arch/mn10300/include/asm/irqflags.h
··· 13 13 #define _ASM_IRQFLAGS_H 14 14 15 15 #include <asm/cpu-regs.h> 16 - #ifndef __ASSEMBLY__ 17 - #include <linux/smp.h> 18 - #endif 16 + /* linux/smp.h <- linux/irqflags.h needs asm/smp.h first */ 17 + #include <asm/smp.h> 19 18 20 19 /* 21 20 * interrupt control
+3 -1
arch/mn10300/include/asm/smp.h
··· 24 24 #ifndef __ASSEMBLY__ 25 25 #include <linux/threads.h> 26 26 #include <linux/cpumask.h> 27 + #include <linux/thread_info.h> 27 28 #endif 28 29 29 30 #ifdef CONFIG_SMP ··· 86 85 extern void smp_init_cpus(void); 87 86 extern void smp_cache_interrupt(void); 88 87 extern void send_IPI_allbutself(int irq); 89 - extern int smp_nmi_call_function(smp_call_func_t func, void *info, int wait); 88 + extern int smp_nmi_call_function(void (*func)(void *), void *info, int wait); 90 89 91 90 extern void arch_send_call_function_single_ipi(int cpu); 92 91 extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); ··· 101 100 #ifndef __ASSEMBLY__ 102 101 103 102 static inline void smp_init_cpus(void) {} 103 + #define raw_smp_processor_id() 0 104 104 105 105 #endif /* __ASSEMBLY__ */ 106 106 #endif /* CONFIG_SMP */