Commit a0d2db26 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents ced3985f bb44c308

arch/i386/pci/common.c

+0 −1
Original line number Diff line number Diff line
@@ -343,7 +343,6 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) 


void pcibios_disable_device (struct pci_dev *dev)

{

	pcibios_disable_resources(dev);

	if (pcibios_disable_irq)

		pcibios_disable_irq(dev);

}

arch/i386/pci/i386.c

+0 −9
Original line number Diff line number Diff line
@@ -242,15 +242,6 @@ int pcibios_enable_resources(struct pci_dev *dev, int mask) 
	return 0;

}



void pcibios_disable_resources(struct pci_dev *dev)

{

	u16 cmd;



	pci_read_config_word(dev, PCI_COMMAND, &cmd);

	cmd &= ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY);

	pci_write_config_word(dev, PCI_COMMAND, cmd);

}



/*

 *  If we set up a device for bus mastering, we need to check the latency

 *  timer as certain crappy BIOSes forget to set it properly.

arch/i386/pci/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ extern unsigned int pcibios_max_latency; 


void pcibios_resource_survey(void);

int pcibios_enable_resources(struct pci_dev *, int);

void pcibios_disable_resources(struct pci_dev *);



/* pci-pc.c */

drivers/pci/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ config PCI_MSI 


config PCI_MULTITHREAD_PROBE

	bool "PCI Multi-threaded probe (EXPERIMENTAL)"

	depends on PCI && EXPERIMENTAL

	depends on PCI && EXPERIMENTAL && BROKEN

	help

	  Say Y here if you want the PCI core to spawn a new thread for

	  every PCI device that is probed.  This can cause a huge