Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d539108 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Revert "PCI: remove default PCI expansion ROM memory allocation" 

This reverts commit 9f8dacca, which was
reported to break X startup (xf86-video-ati-6.8.0). See

	http://bugs.freedesktop.org/show_bug.cgi?id=15523



for details.

Reported-by: default avatarLaurence Withers <l@lwithers.me.uk>
Cc: Gary Hade <garyhade@us.ibm.com>
Cc: Greg KH <greg@kroah.com>
Cc: Jan Beulich <jbeulich@novell.com>
Cc: "Jun'ichi Nomura" <j-nomura@ce.jp.nec.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c4f51b46

arch/x86/pci/common.c

+0 −17
Original line number Original line Diff line number Diff line
@@ -77,19 +77,6 @@ int pcibios_scanned; 
 */

 */

DEFINE_SPINLOCK(pci_config_lock);

DEFINE_SPINLOCK(pci_config_lock);





static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev)

{

	struct resource *rom_r = &dev->resource[PCI_ROM_RESOURCE];



	if (rom_r->parent)

		return;

	if (rom_r->start)

		/* we deal with BIOS assigned ROM later */

		return;

	if (!(pci_probe & PCI_ASSIGN_ROMS))

		rom_r->start = rom_r->end = rom_r->flags = 0;

}



static int __devinit can_skip_ioresource_align(const struct dmi_system_id *d)

static int __devinit can_skip_ioresource_align(const struct dmi_system_id *d)

{

{

	pci_probe |= PCI_CAN_SKIP_ISA_ALIGN;

	pci_probe |= PCI_CAN_SKIP_ISA_ALIGN;
@@ -141,11 +128,7 @@ void __init dmi_check_skip_isa_align(void) 




void __devinit  pcibios_fixup_bus(struct pci_bus *b)

void __devinit  pcibios_fixup_bus(struct pci_bus *b)

{

{

	struct pci_dev *dev;



	pci_read_bridge_bases(b);

	pci_read_bridge_bases(b);

	list_for_each_entry(dev, &b->devices, bus_list)

		pcibios_fixup_device_resources(dev);

}

}





/*

/*