Merge branch 'linus' into timers/urgent

Merge in Linus's branch which already has timers/core merged.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 1 insertions, 5 deletions

diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
index 75772ae6c65f..e9fe907cd249 100644
--- a/arch/x86/kernel/cpu/mtrr/generic.c
+++ b/arch/x86/kernel/cpu/mtrr/generic.c
@@ -361,11 +361,7 @@ static void __init print_mtrr_state(void)
         }
         pr_debug("MTRR variable ranges %sabled:\n",
                  mtrr_state.enabled & 2 ? "en" : "dis");
-        if (size_or_mask & 0xffffffffUL)
-                high_width = ffs(size_or_mask & 0xffffffffUL) - 1;
-        else
-                high_width = ffs(size_or_mask>>32) + 32 - 1;
-        high_width = (high_width - (32 - PAGE_SHIFT) + 3) / 4;
+        high_width = (__ffs64(size_or_mask) - (32 - PAGE_SHIFT) + 3) / 4;
 
         for (i = 0; i < num_var_ranges; ++i) {
                 if (mtrr_state.var_ranges[i].mask_lo & (1 << 11))