git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
x86_64
/
mm
/
k8topology.c
diff --git
a/arch/x86_64/mm/k8topology.c
b/arch/x86_64/mm/k8topology.c
index
7c45c2d
..
b5b8dba
100644
(file)
--- a/
arch/x86_64/mm/k8topology.c
+++ b/
arch/x86_64/mm/k8topology.c
@@
-54,6
+54,9
@@
int __init k8_scan_nodes(unsigned long start, unsigned long end)
nodes_clear(nodes_parsed);
nodes_clear(nodes_parsed);
+ if (!early_pci_allowed())
+ return -1;
+
nb = find_northbridge();
if (nb < 0)
return nb;
nb = find_northbridge();
if (nb < 0)
return nb;
@@
-146,6
+149,9
@@
int __init k8_scan_nodes(unsigned long start, unsigned long end)
nodes[nodeid].start = base;
nodes[nodeid].end = limit;
nodes[nodeid].start = base;
nodes[nodeid].end = limit;
+ e820_register_active_regions(nodeid,
+ nodes[nodeid].start >> PAGE_SHIFT,
+ nodes[nodeid].end >> PAGE_SHIFT);
prevbase = base;
prevbase = base;