From: Namhyung Kim <namhyung@gmail.com>
To: "David S. Miller" <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/3] sparc32: fix build failure on CONFIG_SPARC_LEON
Date: Tue, 26 Oct 2010 00:52:38 +0900 [thread overview]
Message-ID: <1288021958-3130-3-git-send-email-namhyung@gmail.com> (raw)
In-Reply-To: <1288021958-3130-1-git-send-email-namhyung@gmail.com>
CC arch/sparc/kernel/irq_32.o
arch/sparc/kernel/irq_32.c: In function 'request_fast_irq':
arch/sparc/kernel/irq_32.c:370:25: error: conflicting types for 'trapbase_cpu1'
arch/sparc/include/asm/leon.h:366:22: note: previous declaration of 'trapbase_cpu1' was here
arch/sparc/kernel/irq_32.c:370:40: error: conflicting types for 'trapbase_cpu2'
arch/sparc/include/asm/leon.h:367:22: note: previous declaration of 'trapbase_cpu2' was here
arch/sparc/kernel/irq_32.c:370:55: error: conflicting types for 'trapbase_cpu3'
arch/sparc/include/asm/leon.h:368:22: note: previous declaration of 'trapbase_cpu3' was here
make[3]: *** [arch/sparc/kernel/irq_32.o] Error 1
make[2]: *** [arch/sparc/kernel] Error 2
make[1]: *** [sub-make] Error 2
make: *** [all] Error 2
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
---
arch/sparc/kernel/irq_32.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/sparc/kernel/irq_32.c b/arch/sparc/kernel/irq_32.c
index 0116d8d..5ad6e5c 100644
--- a/arch/sparc/kernel/irq_32.c
+++ b/arch/sparc/kernel/irq_32.c
@@ -365,7 +365,7 @@ static int request_fast_irq(unsigned int irq,
unsigned long flags;
unsigned int cpu_irq;
int ret;
-#ifdef CONFIG_SMP
+#if defined CONFIG_SMP && !defined CONFIG_SPARC_LEON
struct tt_entry *trap_table;
extern struct tt_entry trapbase_cpu1, trapbase_cpu2, trapbase_cpu3;
#endif
@@ -425,7 +425,7 @@ static int request_fast_irq(unsigned int irq,
table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_four = SPARC_NOP;
INSTANTIATE(sparc_ttable)
-#ifdef CONFIG_SMP
+#if defined CONFIG_SMP && !defined CONFIG_SPARC_LEON
trap_table = &trapbase_cpu1; INSTANTIATE(trap_table)
trap_table = &trapbase_cpu2; INSTANTIATE(trap_table)
trap_table = &trapbase_cpu3; INSTANTIATE(trap_table)
--
1.7.0.4
next prev parent reply other threads:[~2010-10-25 15:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-25 15:52 [PATCH 1/3] sparc: don't #include asm/system.h in asm/jump_label.h Namhyung Kim
2010-10-25 15:52 ` [PATCH 2/3] sparc32: remove CONFIG_HAVE_PERF_EVENTS option Namhyung Kim
2010-10-25 15:59 ` David Miller
2010-10-25 16:31 ` Namhyung Kim
2010-10-25 18:55 ` David Miller
2010-10-25 15:52 ` Namhyung Kim [this message]
2010-10-25 16:00 ` [PATCH 3/3] sparc32: fix build failure on CONFIG_SPARC_LEON David Miller
2010-10-25 16:07 ` Namhyung Kim
2010-10-25 16:09 ` David Miller
2010-10-25 16:11 ` Sam Ravnborg
2010-10-25 18:53 ` David Miller
2010-10-25 19:41 ` Sam Ravnborg
2010-10-26 7:14 ` Daniel Hellstrom
2010-10-25 15:57 ` [PATCH 1/3] sparc: don't #include asm/system.h in asm/jump_label.h David Miller
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=1288021958-3130-3-git-send-email-namhyung@gmail.com \
--to=namhyung@gmail.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=sparclinux@vger.kernel.org \
/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
all inboxes | Powered by JetHome®