From: Henrik Kretzschmar <henne@nachtwindheim.de>
To: mingo@readhat.com
Cc: tglx@linutronix.de, hpa@zytor.com, x86@kernel.org, tj@kernel.org,
yinghai@kernel.org, ak@linux.intel.com, robert.richter@amd.com,
linux-kernel@vger.kernel.org, henne@nachtwindheim.de
Subject: [PATCH 2/6] x86: ifdef enable_IR_x2apic() out
Date: Mon, 14 Feb 2011 11:00:08 +0100 [thread overview]
Message-ID: <1297677612-12405-2-git-send-email-henne@nachtwindheim.de> (raw)
In-Reply-To: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de>
The only caller of enable_IR_x2apic() is probe_64.c, which is only
compiled on x86-64 bit machines.
This function causes compilation problems on 32-bit machines with no
io-apic enabled, so we remove it from 32s and keep the way it was on 64s.
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
---
arch/x86/include/asm/apic.h | 2 ++
arch/x86/kernel/apic/apic.c | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index b8a3484..b1d77e1 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -216,7 +216,9 @@ static inline void x2apic_force_phys(void)
#define x2apic_supported() 0
#endif
+#ifdef CONFIG_X86_64
extern void enable_IR_x2apic(void);
+#endif
extern int get_physical_broadcast(void);
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 306386f..27a7497 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1467,6 +1467,7 @@ int __init enable_IR(void)
return 0;
}
+#ifdef CONFIG_X86_64
void __init enable_IR_x2apic(void)
{
unsigned long flags;
@@ -1540,7 +1541,6 @@ out:
pr_info("Not enabling x2apic, Intr-remapping init failed.\n");
}
-#ifdef CONFIG_X86_64
/*
* Detect and enable local APICs on non-SMP boards.
* Original code written by Keir Fraser.
--
1.7.2.3
next prev parent reply other threads:[~2011-02-14 10:00 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-14 10:00 [PATCH 1/6] x86: move ioapic_irq_destination_types Henrik Kretzschmar
2011-02-14 10:00 ` Henrik Kretzschmar [this message]
2011-02-14 11:03 ` [PATCH 2/6] x86: ifdef enable_IR_x2apic() out Ingo Molnar
2011-02-15 13:47 ` Henrik Kretzschmar
2011-02-15 14:13 ` Gleb Natapov
2011-02-14 10:00 ` [PATCH 3/6] x86: ifdef INTR_REMAP code out Henrik Kretzschmar
2011-02-14 11:02 ` Ingo Molnar
2011-02-14 10:00 ` [PATCH 4/6] x86: add dummy mp_save_irq() Henrik Kretzschmar
2011-02-14 10:00 ` [PATCH 5/6] x86: ifdef ioapic related function out Henrik Kretzschmar
2011-02-14 11:00 ` Ingo Molnar
2011-02-14 10:00 ` [PATCH 6/6] x86: makes X86_UP_IOAPIC work again Henrik Kretzschmar
2011-02-14 11:05 ` [PATCH 1/6] x86: move ioapic_irq_destination_types Ingo Molnar
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=1297677612-12405-2-git-send-email-henne@nachtwindheim.de \
--to=henne@nachtwindheim.de \
--cc=ak@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@readhat.com \
--cc=robert.richter@amd.com \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
--cc=x86@kernel.org \
--cc=yinghai@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®