tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
PCI: Let PCI_MULTITHREAD_PROBE depend on BROKEN
PCI: Revert "PCI: i386/x86_84: disable PCI resource decode on device disable"

Linus Torvalds a0d2db26 ced3985f

+1 -12
unified split
-1
arch/i386/pci/common.c
··· 343 343 344 344 void pcibios_disable_device (struct pci_dev *dev) 345 345 { 346 - pcibios_disable_resources(dev); 347 346 if (pcibios_disable_irq) 348 347 pcibios_disable_irq(dev); 349 348 }
-9
arch/i386/pci/i386.c
··· 242 242 return 0; 243 243 } 244 244 245 - void pcibios_disable_resources(struct pci_dev *dev) 246 - { 247 - u16 cmd; 248 - 249 - pci_read_config_word(dev, PCI_COMMAND, &cmd); 250 - cmd &= ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY); 251 - pci_write_config_word(dev, PCI_COMMAND, cmd); 252 - } 253 - 254 245 /* 255 246 * If we set up a device for bus mastering, we need to check the latency 256 247 * timer as certain crappy BIOSes forget to set it properly.
-1
arch/i386/pci/pci.h
··· 43 43 44 44 void pcibios_resource_survey(void); 45 45 int pcibios_enable_resources(struct pci_dev *, int); 46 - void pcibios_disable_resources(struct pci_dev *); 47 46 48 47 /* pci-pc.c */ 49 48
+1 -1
drivers/pci/Kconfig
··· 19 19 20 20 config PCI_MULTITHREAD_PROBE 21 21 bool "PCI Multi-threaded probe (EXPERIMENTAL)" 22 - depends on PCI && EXPERIMENTAL 22 + depends on PCI && EXPERIMENTAL && BROKEN 23 23 help 24 24 Say Y here if you want the PCI core to spawn a new thread for 25 25 every PCI device that is probed. This can cause a huge