Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/mn10300/include/asm/irqflags.h

+2 −3
Original line number Diff line number Diff line
@@ -13,9 +13,8 @@ 
#define _ASM_IRQFLAGS_H



#include <asm/cpu-regs.h>

#ifndef __ASSEMBLY__

#include <linux/smp.h>

#endif

/* linux/smp.h <- linux/irqflags.h needs asm/smp.h first */

#include <asm/smp.h>



/*

 * interrupt control

arch/mn10300/include/asm/smp.h

+3 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#ifndef __ASSEMBLY__

#include <linux/threads.h>

#include <linux/cpumask.h>

#include <linux/thread_info.h>

#endif



#ifdef CONFIG_SMP
@@ -85,7 +86,7 @@ extern cpumask_t cpu_boot_map; 
extern void smp_init_cpus(void);

extern void smp_cache_interrupt(void);

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_ipi_mask(const struct cpumask *mask);
@@ -100,6 +101,7 @@ extern void __cpu_die(unsigned int cpu); 
#ifndef __ASSEMBLY__



static inline void smp_init_cpus(void) {}

#define raw_smp_processor_id() 0



#endif /* __ASSEMBLY__ */

#endif /* CONFIG_SMP */