diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-14 22:56:02 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-14 22:56:02 -0500 |
| commit | 4060994c3e337b40e0f6fa8ce2cc178e021baf3d (patch) | |
| tree | 980297c1747ca89354bc879cc5d17903eacb19e2 /arch/x86_64/mm/k8topology.c | |
| parent | 0174f72f848dfe7dc7488799776303c81b181b16 (diff) | |
| parent | d3ee871e63d0a0c70413dc0aa5534b8d6cd6ec37 (diff) | |
Merge x86-64 update from Andi
Diffstat (limited to 'arch/x86_64/mm/k8topology.c')
| -rw-r--r-- | arch/x86_64/mm/k8topology.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86_64/mm/k8topology.c b/arch/x86_64/mm/k8topology.c index 65417b040c1b..a5663e0bb01c 100644 --- a/arch/x86_64/mm/k8topology.c +++ b/arch/x86_64/mm/k8topology.c | |||
| @@ -108,6 +108,7 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end) | |||
| 108 | limit >>= 16; | 108 | limit >>= 16; |
| 109 | limit <<= 24; | 109 | limit <<= 24; |
| 110 | limit |= (1<<24)-1; | 110 | limit |= (1<<24)-1; |
| 111 | limit++; | ||
| 111 | 112 | ||
| 112 | if (limit > end_pfn << PAGE_SHIFT) | 113 | if (limit > end_pfn << PAGE_SHIFT) |
| 113 | limit = end_pfn << PAGE_SHIFT; | 114 | limit = end_pfn << PAGE_SHIFT; |