From c1043892d1baec2de620435215e8f2f61544b4ba Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Tue, 22 Dec 2009 15:40:40 -0800
Subject: [PATCH] --- yaml --- r: 178895 b: refs/heads/master c:
 a557aae29cf5916295c234d4b10ba3f8f29b8a96 h: refs/heads/master i:   178893:
 4adf08203775475c3c057e7613c3a65872185cd8   178891:
 5885141f686a24b27f1086ebbb6cbb1a86ba2746   178887:
 3d443dfdf4ef1807782b7d7cdb7b1374cbaefada   178879:
 f3f9c9a82fc634754e957d43d183b76a2e728e01 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/pci/intel_bus.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 73782bf99fae..428bbb18c315 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9dad0fd5a73d4048dff18069733c0b515f68df74
+refs/heads/master: a557aae29cf5916295c234d4b10ba3f8f29b8a96
diff --git a/trunk/arch/x86/pci/intel_bus.c b/trunk/arch/x86/pci/intel_bus.c
index b7a55dc55d13..f81a2fa8fe25 100644
--- a/trunk/arch/x86/pci/intel_bus.c
+++ b/trunk/arch/x86/pci/intel_bus.c
@@ -49,6 +49,10 @@ static void __devinit pci_root_bus_res(struct pci_dev *dev)
 	u64 mmioh_base, mmioh_end;
 	int bus_base, bus_end;
 
+	/* some sys doesn't get mmconf enabled */
+	if (dev->cfg_size < 0x120)
+		return;
+
 	if (pci_root_num >= PCI_ROOT_NR) {
 		printk(KERN_DEBUG "intel_bus.c: PCI_ROOT_NR is too small\n");
 		return;