From 4c8a2d6329f027bf07adeec5dd8b234528f9f44a Mon Sep 17 00:00:00 2001
From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Tue, 4 Dec 2007 19:50:03 +0000
Subject: [PATCH] Disable mmconfig by default, it breaks quite often.

---
 kernel-2.6-planetlab.spec  |  4 +++-
 linux-2.6-560-mmconf.patch | 24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 linux-2.6-560-mmconf.patch

diff --git a/kernel-2.6-planetlab.spec b/kernel-2.6-planetlab.spec
index 923d969dc..cb4898c01 100644
--- a/kernel-2.6-planetlab.spec
+++ b/kernel-2.6-planetlab.spec
@@ -25,7 +25,7 @@ Summary: The Linux kernel (the core of the Linux operating system)
 
 # Will go away when VServer supports NetNS in mainline. Currently, it must be 
 # updated every time the PL kernel is updated.
-%define vini_pl_patch 551
+%define vini_pl_patch 561
 
 %define specrelease 1
 
@@ -147,6 +147,7 @@ Patch520: linux-2.6-520-vnet+.patch
 Patch530: linux-2.6-530-built-by-support.patch
 Patch540: linux-2.6-540-oom-kill.patch
 Patch550: linux-2.6-550-raise-default-nfile-ulimit.patch
+Patch560: linux-2.6-560-mmconf.patch
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
 
@@ -322,6 +323,7 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 530
 %ApplyPatch 540
 %ApplyPatch 550
+%ApplyPatch 560
 
 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
 # break with later patches.
diff --git a/linux-2.6-560-mmconf.patch b/linux-2.6-560-mmconf.patch
new file mode 100644
index 000000000..eb7db27e1
--- /dev/null
+++ b/linux-2.6-560-mmconf.patch
@@ -0,0 +1,24 @@
+diff -Nurp linux-2.6.22-550/arch/i386/pci/common.c linux-2.6.22-560/arch/i386/pci/common.c
+--- linux-2.6.22-550/arch/i386/pci/common.c	2007-07-21 17:58:15.000000000 -0400
++++ linux-2.6.22-560/arch/i386/pci/common.c	2007-12-04 14:47:24.000000000 -0500
+@@ -17,8 +17,7 @@
+ 
+ #include "pci.h"
+ 
+-unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2 |
+-				PCI_PROBE_MMCONF;
++unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2;
+ 
+ static int pci_bf_sort;
+ int pci_routeirq;
+@@ -388,6 +387,10 @@ char * __devinit  pcibios_setup(char *st
+ 		pci_probe &= ~PCI_PROBE_MMCONF;
+ 		return NULL;
+ 	}
++	else if (!strcmp(str, "mmconf")) {
++		pci_probe |= PCI_PROBE_MMCONF;
++		return NULL;
++	}
+ #endif
+ 	else if (!strcmp(str, "noacpi")) {
+ 		acpi_noirq_set();
-- 
2.47.0