]> git.baikalelectronics.ru Git - kernel.git/commit
Move request_standard_resources() back to before PCI probing
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 9 Apr 2006 19:14:02 +0000 (12:14 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 9 Apr 2006 19:14:02 +0000 (12:14 -0700)
commit834f41b9b18423bc9ba57b7d21a93d25272ae563
tree7f11359eec8c511e5fcf7340c93f9a84a2bad0e2
parent9ff3a32412c61ef1708323a06f09c098c473cf3b
Move request_standard_resources() back to before PCI probing

This effectively undoes the PCI resource allocation changes done in
commit 89e4a16825d2428c69f241483251505bc597da7c, 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

   http://bugzilla.kernel.org/show_bug.cgi?id=6337

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 <ink@jurassic.park.msu.ru>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Antonino A. Daplas <adaplas@pol.net>
Cc: <bjk@luxsci.net>
Tested-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/i386/kernel/setup.c