diff --git a/[refs] b/[refs] index d6775f3401d3..044ad6744894 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd69aa6b383c6a6373bff2204190cadf451ebcc3 +refs/heads/master: 7e9a2f0a080ba2f247559e95eb0df7072bede18a diff --git a/trunk/arch/x86/mm/amdtopology.c b/trunk/arch/x86/mm/amdtopology.c index 5247d01329ca..2ca15b59fb3f 100644 --- a/trunk/arch/x86/mm/amdtopology.c +++ b/trunk/arch/x86/mm/amdtopology.c @@ -130,9 +130,8 @@ int __init amd_numa_init(void) } limit >>= 16; - limit <<= 24; - limit |= (1<<24)-1; limit++; + limit <<= 24; if (limit > end) limit = end;