From: Martin Bundgaard <martin@mindflux.org>
Date: Thu, 14 Mar 2013 18:34:35 +0000 (+0100)
Subject: x86/mm/numa: Simplify some bit mangling
X-Git-Tag: firefly_0821_release~3680^2~647^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7e9a2f0a080ba2f247559e95eb0df7072bede18a;p=firefly-linux-kernel-4.4.55.git

x86/mm/numa: Simplify some bit mangling

Minor. Reordered a few lines to lose a superfluous OR operation.

Signed-off-by: Martin Bundgaard <martin@mindflux.org>
Link: http://lkml.kernel.org/r/1363286075-62615-1-git-send-email-martin@mindflux.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

diff --git a/arch/x86/mm/amdtopology.c b/arch/x86/mm/amdtopology.c
index 5247d01329ca..2ca15b59fb3f 100644
--- 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;