RE: kernel/microcode.c error from new 64bit code

From: Nakajima, Jun
Date: Wed Feb 18 2004 - 19:14:52 EST


Looks good to me.

Jun
>-----Original Message-----
>From: linux-kernel-owner@xxxxxxxxxxxxxxx [mailto:linux-kernel-
>owner@xxxxxxxxxxxxxxx] On Behalf Of Linus Torvalds
>Sent: Wednesday, February 18, 2004 3:08 PM
>To: Stephen Hemminger
>Cc: ak@xxxxxxx; linux-kernel@xxxxxxxxxxxxxxx
>Subject: Re: kernel/microcode.c error from new 64bit code
>
>
>
>On Wed, 18 Feb 2004, Stephen Hemminger wrote:
>>
>> In the mad rush to put in Intel 64 bit support, did anyone make sure
and
>not
>> break the 32 bit build?
>
>Heh. Somebody has the driver enabled ;).
>
>How about this patch?
>
> Linus
>
>---
>===== arch/i386/kernel/microcode.c 1.24 vs edited =====
>--- 1.24/arch/i386/kernel/microcode.c Tue Feb 17 18:14:37 2004
>+++ edited/arch/i386/kernel/microcode.c Wed Feb 18 15:05:38 2004
>@@ -371,8 +371,9 @@
> spin_lock_irqsave(&microcode_update_lock, flags);
>
> /* write microcode via MSR 0x79 */
>- wrmsr(MSR_IA32_UCODE_WRITE, (u64)(uci->mc->bits),
>- (u64)(uci->mc->bits) >> 32);
>+ wrmsr(MSR_IA32_UCODE_WRITE,
>+ (unsigned long) uci->mc->bits,
>+ (unsigned long) uci->mc->bits >> 16 >> 16);
> wrmsr(MSR_IA32_UCODE_REV, 0, 0);
>
> __asm__ __volatile__ ("cpuid" : : : "ax", "bx", "cx", "dx");
>-
>To unsubscribe from this list: send the line "unsubscribe linux-kernel"
in
>the body of a message to majordomo@xxxxxxxxxxxxxxx
>More majordomo info at http://vger.kernel.org/majordomo-info.html
>Please read the FAQ at http://www.tux.org/lkml/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/