diff options
| author | Linus Torvalds | 2006-09-19 17:15:22 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2006-09-19 17:15:22 +0200 |
| commit | 79e453d49bd49ba1b576f89310cc565c9e4ca379 (patch) | |
| tree | 690353097ed789d691c072edd3a7259e3477d511 /arch/i386/pci/pci.h | |
| parent | Merge git://git.infradead.org/mtd-2.6 (diff) | |
| download | kernel-qcow2-linux-79e453d49bd49ba1b576f89310cc565c9e4ca379.tar.gz kernel-qcow2-linux-79e453d49bd49ba1b576f89310cc565c9e4ca379.tar.xz kernel-qcow2-linux-79e453d49bd49ba1b576f89310cc565c9e4ca379.zip | |
Revert mmiocfg heuristics and blacklist changes
This reverts commits 11012d419cfc0e0f78ca356aca03674217910124 and
40dd2d20f220eda1cd0da8ea3f0f9db8971ba237, which allowed us to use the
MMIO accesses for PCI config cycles even without the area being marked
reserved in the e820 memory tables.
Those changes were needed for EFI-environment Intel macs, but broke some
newer Intel 965 boards, so for now it's better to revert to our old
2.6.17 behaviour and at least avoid introducing any new breakage.
Andi Kleen has a set of patches that work with both EFI and the broken
Intel 965 boards, which will be applied once they get wider testing.
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Edgar Hucek <hostmaster@ed-soft.at>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/pci/pci.h')
| -rw-r--r-- | arch/i386/pci/pci.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/i386/pci/pci.h b/arch/i386/pci/pci.h index 49a849b3a241..bf4e79335388 100644 --- a/arch/i386/pci/pci.h +++ b/arch/i386/pci/pci.h @@ -16,8 +16,7 @@ #define PCI_PROBE_CONF1 0x0002 #define PCI_PROBE_CONF2 0x0004 #define PCI_PROBE_MMCONF 0x0008 -#define PCI_PROBE_MMCONF_FORCE 0x0010 -#define PCI_PROBE_MASK 0x00ff +#define PCI_PROBE_MASK 0x000f #define PCI_NO_SORT 0x0100 #define PCI_BIOS_SORT 0x0200 |