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

[Pavel Machek <pavel@suse.cz>]

Hi!

> > 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);
				             ~~~~~~~~~~~~

I see what you are doing, but this is evil. At least comment /* ">> 32"
is undefined on i386 */ ?
								Pavel

-- 
When do you have a heart between your knees?
[Johanka's followup: and *two* hearts?]