Commit 66004a6c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Move request_standard_resources() back to before PCI probing

This effectively undoes the PCI resource allocation changes done in
commit b408cbc7, but leaves the cleanups
of that commit in place.

We're going back to marking the resources reported by e820 busy _before_
doing PCI probing, so that any PCI resource that clashes with the BIOS-
reported memory map will be reloacted to a non-clashing area.

The reason? Larry Finger reports that his laptop has the cardbus
controller set up by the BIOS so that it conflicts with the e820 memory
map, and needs to be relocated. See

for more details.

We'll have to work out how to handle the fbcon problem that caused that
commit in the first place in some other way.

Cc: Ivan Kokshaysky <>
Cc: Greg Kroah-Hartman <>
Cc: Antonino A. Daplas <>
Cc: <>
Tested-by: default avatarLarry Finger <>
Signed-off-by: default avatarLinus Torvalds <>
parent b8feb47f
......@@ -1347,8 +1347,8 @@ legacy_init_iomem_resources(struct resource *code_resource, struct resource *dat
* Request address space for all standard resources
* This is called just before pcibios_assign_resources(), which is also
* an fs_initcall, but is linked in later (in arch/i386/pci/i386.c).
* This is called just before pcibios_init(), which is also a
* subsys_initcall, but is linked in later (in arch/i386/pci/common.c).
static int __init request_standard_resources(void)
......@@ -1369,7 +1369,7 @@ static int __init request_standard_resources(void)
return 0;
static void __init register_memory(void)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment