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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  x86/pci: fix mmconfig detection with 32bit near 4g
  PCI: use fixed-up device class when configuring device
parents f07502da 75e613cd

arch/x86/pci/mmconfig-shared.c

+3 −3
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ static acpi_status __init check_mcfg_resource(struct acpi_resource *res, 
		if (!fixmem32)

			return AE_OK;

		if ((mcfg_res->start >= fixmem32->address) &&

		    (mcfg_res->end <= (fixmem32->address +

		    (mcfg_res->end < (fixmem32->address +

				      fixmem32->address_length))) {

			mcfg_res->flags = 1;

			return AE_CTRL_TERMINATE;
@@ -392,7 +392,7 @@ static acpi_status __init check_mcfg_resource(struct acpi_resource *res, 
		return AE_OK;



	if ((mcfg_res->start >= address.minimum) &&

	    (mcfg_res->end <= (address.minimum + address.address_length))) {

	    (mcfg_res->end < (address.minimum + address.address_length))) {

		mcfg_res->flags = 1;

		return AE_CTRL_TERMINATE;

	}
@@ -418,7 +418,7 @@ static int __init is_acpi_reserved(u64 start, u64 end, unsigned not_used) 
	struct resource mcfg_res;



	mcfg_res.start = start;

	mcfg_res.end = end;

	mcfg_res.end = end - 1;

	mcfg_res.flags = 0;



	acpi_get_devices("PNP0C01", find_mboard_resource, &mcfg_res, NULL);

drivers/pci/probe.c

+2 −0
Original line number Diff line number Diff line
@@ -745,6 +745,8 @@ int pci_setup_device(struct pci_dev *dev) 


	/* Early fixups, before probing the BARs */

	pci_fixup_device(pci_fixup_early, dev);

	/* device class may be changed after fixup */

	class = dev->class >> 8;



	switch (dev->hdr_type) {		    /* header type */

	case PCI_HEADER_TYPE_NORMAL:		    /* standard header */