From: Andi Kleen Date: Mon, 10 Oct 2005 23:28:33 +0000 (+0200) Subject: [PATCH] i386: Don't discard upper 32bits of HWCR on K8 X-Git-Tag: v2.6.14-rc4~1 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3c92c2ba33cd7d666c5f83cc32aa590e794e91b0;p=linux-2.6-omap-h63xx.git [PATCH] i386: Don't discard upper 32bits of HWCR on K8 Need to use long long, not long when RMWing a MSR. I think it's harmless right now, but still should be better fixed if AMD adds any bits in the upper 32bit of HWCR. Bug was introduced with the TLB flush filter fix for i386 Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds --- diff --git a/arch/i386/kernel/cpu/amd.c b/arch/i386/kernel/cpu/amd.c index 4c1ddf2b57c..53a1681cd96 100644 --- 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