From 86cb4e63611faa3f7f84377561f529d3cec607d6 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 6 Jul 2012 15:07:48 +0100 Subject: [PATCH] --- yaml --- r: 312397 b: refs/heads/master c: 1ba9a294141b106b7247649a5c3372d8284eca80 h: refs/heads/master i: 312395: 6eadffb89e09405d187aca2cc4e7ee575ad87d58 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/mtrr/cleanup.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ef5fd2222578..63cbffeef888 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 954e482bde20b0e208fd4d34ef26e10afd194600 +refs/heads/master: 1ba9a294141b106b7247649a5c3372d8284eca80 diff --git a/trunk/arch/x86/kernel/cpu/mtrr/cleanup.c b/trunk/arch/x86/kernel/cpu/mtrr/cleanup.c index bdda2e6c673b..35ffda5d0727 100644 --- a/trunk/arch/x86/kernel/cpu/mtrr/cleanup.c +++ b/trunk/arch/x86/kernel/cpu/mtrr/cleanup.c @@ -258,11 +258,11 @@ range_to_mtrr(unsigned int reg, unsigned long range_startk, /* Compute the maximum size with which we can make a range: */ if (range_startk) - max_align = ffs(range_startk) - 1; + max_align = __ffs(range_startk); else - max_align = 32; + max_align = BITS_PER_LONG - 1; - align = fls(range_sizek) - 1; + align = __fls(range_sizek); if (align > max_align) align = max_align;