diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 11:36:18 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 11:36:18 -0500 |
| commit | d22a8ccff761c81f2930bd90fa5712e51a0e9a62 (patch) | |
| tree | 52a92cf1b9a65e4440276706c4b4e879d4008a87 /arch/x86_64/mm/numa.c | |
| parent | 783e3385a134305d49d7b431df6e591265e7ec14 (diff) | |
| parent | 98684a9d91bceff829b6dc7adf0f662d59cfa6e3 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/x86_64/mm/numa.c')
| -rw-r--r-- | arch/x86_64/mm/numa.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86_64/mm/numa.c b/arch/x86_64/mm/numa.c index a828a01739c..15b67d2760c 100644 --- a/arch/x86_64/mm/numa.c +++ b/arch/x86_64/mm/numa.c @@ -53,6 +53,8 @@ static int __init populate_memnodemap( int res = -1; unsigned long addr, end; + if (shift >= 64) + return -1; memset(memnodemap, 0xff, sizeof(memnodemap)); for (i = 0; i < numnodes; i++) { addr = nodes[i].start; @@ -65,7 +67,7 @@ static int __init populate_memnodemap( if (memnodemap[addr >> shift] != 0xff) return -1; memnodemap[addr >> shift] = i; - addr += (1 << shift); + addr += (1UL << shift); } while (addr < end); res = 1; } |