git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
arch
/
x86_64
/
mm
/
k8topology.c
diff --git
a/arch/x86_64/mm/k8topology.c
b/arch/x86_64/mm/k8topology.c
index
65417b0
..
b5b8dba
100644
(file)
--- a/
arch/x86_64/mm/k8topology.c
+++ b/
arch/x86_64/mm/k8topology.c
@@
-43,7
+43,7
@@
static __init int find_northbridge(void)
int __init k8_scan_nodes(unsigned long start, unsigned long end)
{
unsigned long prevbase;
int __init k8_scan_nodes(unsigned long start, unsigned long end)
{
unsigned long prevbase;
- struct node nodes[8];
+ struct
boot
node nodes[8];
int nodeid, i, nb;
unsigned char nodeids[8];
int found = 0;
int nodeid, i, nb;
unsigned char nodeids[8];
int found = 0;
@@
-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;
@@
-108,6
+111,7
@@
int __init k8_scan_nodes(unsigned long start, unsigned long end)
limit >>= 16;
limit <<= 24;
limit |= (1<<24)-1;
limit >>= 16;
limit <<= 24;
limit |= (1<<24)-1;
+ limit++;
if (limit > end_pfn << PAGE_SHIFT)
limit = end_pfn << PAGE_SHIFT;
if (limit > end_pfn << PAGE_SHIFT)
limit = end_pfn << PAGE_SHIFT;
@@
-145,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;
@@
-154,7
+161,7
@@
int __init k8_scan_nodes(unsigned long start, unsigned long end)
if (!found)
return -1;
if (!found)
return -1;
- memnode_shift = compute_hash_shift(nodes,
numnodes
);
+ memnode_shift = compute_hash_shift(nodes,
8
);
if (memnode_shift < 0) {
printk(KERN_ERR "No NUMA node hash function found. Contact maintainer\n");
return -1;
if (memnode_shift < 0) {
printk(KERN_ERR "No NUMA node hash function found. Contact maintainer\n");
return -1;