Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[karo-tx-linux.git] / arch / x86 / mm / amdtopology.c

diff --git a/arch/x86/mm/amdtopology.c b/arch/x86/mm/amdtopology.c
index 5247d01329ca96de7e9eacbb3f2511ff8f9c3a59..2ca15b59fb3f823a0e900918bac6042b49ec2fab 100644 (file)
--- a/arch/x86/mm/amdtopology.c
+++ b/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;