[PATCH 2/2] mn10300: Fix include dependency in irqflags.h

From: ddaney . cavm
Date: Sun Jun 16 2013 - 16:07:36 EST


From: David Daney <david.daney@xxxxxxxxxx>

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().

Signed-off-by: David Daney <david.daney@xxxxxxxxxx>
---
arch/mn10300/include/asm/irqflags.h | 3 ++-
arch/mn10300/include/asm/smp.h | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/mn10300/include/asm/irqflags.h b/arch/mn10300/include/asm/irqflags.h
index 678f68d..06e0a17 100644
--- a/arch/mn10300/include/asm/irqflags.h
+++ b/arch/mn10300/include/asm/irqflags.h
@@ -14,7 +14,8 @@

#include <asm/cpu-regs.h>
#ifndef __ASSEMBLY__
-#include <linux/smp.h>
+/* linux/smp.h <- linux/irqflags.h needs asm/smp.h first */
+#include <asm/smp.h>
#endif

/*
diff --git a/arch/mn10300/include/asm/smp.h b/arch/mn10300/include/asm/smp.h
index 6745dbe..498e5ab 100644
--- a/arch/mn10300/include/asm/smp.h
+++ b/arch/mn10300/include/asm/smp.h
@@ -100,6 +100,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 */
--
1.7.11.7

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/