From: Henrik Kretzschmar Subject: [PATCH 3/6] x86: ifdef INTR_REMAP code out Date: Mon, 14 Feb 2011 11:00:09 +0100 Lines: 58 Message-ID: <1297677612-12405-3-git-send-email-henne@nachtwindheim.de> References: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de> 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 To: mingo@readhat.com X-From: linux-kernel-owner@vger.kernel.org Mon Feb 14 11:01:30 2011 Return-path: Envelope-to: glk-linux-kernel-3@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PovFF-0006cV-Te for glk-linux-kernel-3@lo.gmane.org; Mon, 14 Feb 2011 11:01:26 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753126Ab1BNKBX (ORCPT ); Mon, 14 Feb 2011 05:01:23 -0500 Received: from server103.greatnet.de ([83.133.97.6]:38330 "EHLO server103.greatnet.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752268Ab1BNKAX (ORCPT ); Mon, 14 Feb 2011 05:00:23 -0500 Received: from localhost.localdomain (cmnz-d9bab6be.pool.mediaWays.net [217.186.182.190]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by server103.greatnet.de (Postfix) with ESMTPSA id 29517950DB4; Mon, 14 Feb 2011 10:59:07 +0100 (CET) X-Mailer: git-send-email 1.7.1 In-Reply-To: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Archived-At: 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 --- 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