Merge branch 'master'

[linux-2.6-omap-h63xx.git] / arch / i386 / kernel / cpu / amd.c

diff --git a/arch/i386/kernel/cpu/amd.c b/arch/i386/kernel/cpu/amd.c
index 4c1ddf2b57cc37d4196091ee41ea5c5035993023..53a1681cd9648daf41bd218bbd7241bf746275e4 100644 (file)
--- a/arch/i386/kernel/cpu/amd.c
+++ b/arch/i386/kernel/cpu/amd.c
@@ -29,7 +29,7 @@ static void __init init_amd(struct cpuinfo_x86 *c)
        int r;
 
 #ifdef CONFIG_SMP
-       unsigned long value;
+       unsigned long long value;
 
        /* Disable TLB flush filter by setting HWCR.FFDIS on K8
         * bit 6 of msr C001_0015