[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110925212900.10713.67058.stgit@bhelgaas.mtv.corp.google.com>
Date: Sun, 25 Sep 2011 15:29:00 -0600
From: Bjorn Helgaas <bhelgaas@...gle.com>
To: Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...hat.com>,
"H. Peter Anvin" <hpa@...or.com>
Cc: Dan McGrath <troubledaemon@...il.com>, x86@...nel.org,
linux-kernel@...r.kernel.org, stable@...nel.org#2.6.26+,
Jonathan Nieder <jrnieder@...il.com>,
Alexey Starikovskiy <astarikovskiy@...e.de>
Subject: [PATCH] x86: mpparse: fix mp_bus_not_pci handling
Dan bisected a Dell PowerEdge 4200 boot regression to commit f8924e770.
Prior to that commit, 32-bit kernels set mp_bus_not_pci for all buses
except PCI. Afterwards, we set mp_bus_not_pci only for ISA. But ISA is
not the only non-PCI bus, so it's better to always set mp_bus_not_pci
and clear it only for PCI.
The workaround was to boot with "noapic". Dan verified that with this
patch, his system boots without "noapic".
Reference: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=586494
Reported-and-tested-by: Dan McGrath <troubledaemon@...il.com>
Cc: Alexey Starikovskiy <astarikovskiy@...e.de>
Cc: stable@...nel.org # 2.6.26+
Signed-off-by: Bjorn Helgaas <bhelgaas@...gle.com>
---
arch/x86/kernel/mpparse.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index 9103b89..0741b062 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -95,8 +95,8 @@ static void __init MP_bus_info(struct mpc_bus *m)
}
#endif
+ set_bit(m->busid, mp_bus_not_pci);
if (strncmp(str, BUSTYPE_ISA, sizeof(BUSTYPE_ISA) - 1) == 0) {
- set_bit(m->busid, mp_bus_not_pci);
#if defined(CONFIG_EISA) || defined(CONFIG_MCA)
mp_bus_id_to_type[m->busid] = MP_BUS_ISA;
#endif
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists