Skip to content

Commit c069114

Browse files
daviddaneytorvalds
authored andcommitted
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>
1 parent b9e763c commit c069114

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

arch/mn10300/include/asm/irqflags.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
#define _ASM_IRQFLAGS_H
1414

1515
#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>
1918

2019
/*
2120
* interrupt control

arch/mn10300/include/asm/smp.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#ifndef __ASSEMBLY__
2525
#include <linux/threads.h>
2626
#include <linux/cpumask.h>
27+
#include <linux/thread_info.h>
2728
#endif
2829

2930
#ifdef CONFIG_SMP
@@ -85,7 +86,7 @@ extern cpumask_t cpu_boot_map;
8586
extern void smp_init_cpus(void);
8687
extern void smp_cache_interrupt(void);
8788
extern void send_IPI_allbutself(int irq);
88-
extern int smp_nmi_call_function(smp_call_func_t func, void *info, int wait);
89+
extern int smp_nmi_call_function(void (*func)(void *), void *info, int wait);
8990

9091
extern void arch_send_call_function_single_ipi(int cpu);
9192
extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);
@@ -100,6 +101,7 @@ extern void __cpu_die(unsigned int cpu);
100101
#ifndef __ASSEMBLY__
101102

102103
static inline void smp_init_cpus(void) {}
104+
#define raw_smp_processor_id() 0
103105

104106
#endif /* __ASSEMBLY__ */
105107
#endif /* CONFIG_SMP */

0 commit comments

Comments
 (0)