mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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 3/6] x86: ifdef INTR_REMAP code out
Date: Mon, 14 Feb 2011 11:00:09 +0100	[thread overview]
Message-ID: <1297677612-12405-3-git-send-email-henne@nachtwindheim.de> (raw)
In-Reply-To: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de>

Interrupt remapping is only available on 64-bit machines,
so it has no place in lapic_resume() for 32bit machines.

Compilation on 32bit machines would produce errors here.

Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
---
 arch/x86/kernel/apic/apic.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 27a7497..999c531 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -2109,12 +2109,15 @@ static int lapic_resume(struct sys_device *dev)
 	unsigned long flags;
 	int maxlvt;
 	int ret = 0;
-	struct IO_APIC_route_entry **ioapic_entries = NULL;
 
 	if (!apic_pm_state.active)
 		return 0;
 
 	local_irq_save(flags);
+
+#ifdef CONFIG_INTR_REMAP
+	struct IO_APIC_route_entry **ioapic_entries = NULL;
+
 	if (intr_remapping_enabled) {
 		ioapic_entries = alloc_ioapic_entries();
 		if (!ioapic_entries) {
@@ -2133,6 +2136,7 @@ static int lapic_resume(struct sys_device *dev)
 		mask_IO_APIC_setup(ioapic_entries);
 		legacy_pic->mask_all();
 	}
+#endif
 
 	if (x2apic_mode)
 		enable_x2apic();
@@ -2173,6 +2177,7 @@ static int lapic_resume(struct sys_device *dev)
 	apic_write(APIC_ESR, 0);
 	apic_read(APIC_ESR);
 
+#ifdef CONFIG_INTR_REMAP
 	if (intr_remapping_enabled) {
 		reenable_intr_remapping(x2apic_mode);
 		legacy_pic->restore_mask();
@@ -2180,6 +2185,7 @@ static int lapic_resume(struct sys_device *dev)
 		free_ioapic_entries(ioapic_entries);
 	}
 restore:
+#endif
 	local_irq_restore(flags);
 
 	return ret;
-- 
1.7.2.3


  parent reply	other threads:[~2011-02-14 10:01 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 ` [PATCH 2/6] x86: ifdef enable_IR_x2apic() out Henrik Kretzschmar
2011-02-14 11:03   ` Ingo Molnar
2011-02-15 13:47     ` Henrik Kretzschmar
2011-02-15 14:13       ` Gleb Natapov
2011-02-14 10:00 ` Henrik Kretzschmar [this message]
2011-02-14 11:02   ` [PATCH 3/6] x86: ifdef INTR_REMAP code out 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-3-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®