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 branch 'devel' into next
[pandora-kernel.git]
/
arch
/
x86
/
mm
/
k8topology_64.c
diff --git
a/arch/x86/mm/k8topology_64.c
b/arch/x86/mm/k8topology_64.c
index
317573e
..
41f1b5c
100644
(file)
--- a/
arch/x86/mm/k8topology_64.c
+++ b/
arch/x86/mm/k8topology_64.c
@@
-143,8
+143,8
@@
int __init k8_scan_nodes(unsigned long start, unsigned long end)
limit |= (1<<24)-1;
limit++;
- if (limit >
end
_pfn << PAGE_SHIFT)
- limit =
end
_pfn << PAGE_SHIFT;
+ if (limit >
max
_pfn << PAGE_SHIFT)
+ limit =
max
_pfn << PAGE_SHIFT;
if (limit <= base)
continue;