From: ddaney.cavm@gmail.com
To: Linus Torvalds <torvalds@linux-foundation.org>,
linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert@linux-m68k.org>,
Tony Luck <tony.luck@intel.com>,
Fenghua Yu <fenghua.yu@intel.com>,
linux-ia64@vger.kernel.org, David Howells <dhowells@redhat.com>,
Koichi Yasutake <yasutake.koichi@jp.panasonic.com>,
linux-am33-list@redhat.com
Cc: david.s.daney@gmail.com, David Daney <david.daney@cavium.com>
Subject: [PATCH 2/2] mn10300: Fix include dependency in irqflags.h
Date: Sun, 16 Jun 2013 20:06:29 +0000 [thread overview]
Message-ID: <1371413189-2568-3-git-send-email-ddaney.cavm@gmail.com> (raw)
In-Reply-To: <1371413189-2568-1-git-send-email-ddaney.cavm@gmail.com>
From: David Daney <david.daney@cavium.com>
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@cavium.com>
---
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
next prev parent reply other threads:[~2013-06-16 20:06 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-16 20:06 [PATCH 0/2] Fix v3.10-rc6 failures in ia64 and mn10300 ddaney.cavm
2013-06-16 20:06 ` [PATCH 1/2] ia64: Fix include dependency in asm/irqflags.h ddaney.cavm
2013-06-17 7:28 ` Geert Uytterhoeven
2013-06-16 20:06 ` ddaney.cavm [this message]
2013-06-17 7:07 ` [PATCH 2/2] mn10300: Fix include dependency in irqflags.h Geert Uytterhoeven
2013-06-17 10:12 ` Geert Uytterhoeven
2013-06-17 14:48 ` David Daney
2013-06-17 15:46 ` [PATCH v2] mn10300: Fix include dependency in irqflags.h et al ddaney.cavm
2013-06-17 19:01 ` Geert Uytterhoeven
2013-06-19 10:05 ` David Howells
2013-06-17 9:07 ` [PATCH 2/2] mn10300: Fix include dependency in irqflags.h David Howells
2013-06-17 10:11 ` Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1371413189-2568-3-git-send-email-ddaney.cavm@gmail.com \
--to=ddaney.cavm@gmail.com \
--cc=david.daney@cavium.com \
--cc=david.s.daney@gmail.com \
--cc=dhowells@redhat.com \
--cc=fenghua.yu@intel.com \
--cc=geert@linux-m68k.org \
--cc=linux-am33-list@redhat.com \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tony.luck@intel.com \
--cc=torvalds@linux-foundation.org \
--cc=yasutake.koichi@jp.panasonic.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).