Re: nmi_watchdog=2 - Oops with 2.6.8

[Zarakin]

> try this patch please.
>
> --- linux-2.5/arch/i386/kernel/nmi.c~ 2004-06-15 10:52:00.000000000 +0200
> +++ linux-2.5/arch/i386/kernel/nmi.c 2004-08-25 17:33:45.000000000 +0200
> @@ -376,7 +376,13 @@
>   clear_msr_range(0x3F1, 2);
>   /* MSR 0x3F0 seems to have a default value of 0xFC00, but current
>      docs doesn't fully define it, so leave it alone for now. */
> - clear_msr_range(0x3A0, 31);
> + if (boot_cpu_data.x86_model >= 0x3) {
> + /* MSR_P4_IQ_ESCR0/1 (0x3ba/0x3bb) removed */
> + clear_msr_range(0x3A0, 26);
> + clear_msr_range(0x3BC, 3);
> + } else {
> + clear_msr_range(0x3A0, 31);
> + }
>   clear_msr_range(0x3C0, 6);
>   clear_msr_range(0x3C8, 6);
>   clear_msr_range(0x3E0, 2);

It worked, my machine boots now fine with nmi_watchdog=2.

I can also confirm that oprofile is broken due to the missing
MSR_P4_IQ_ESCR0/1:
http://marc.theaimsgroup.com/?l=oprofile-list&m=109323108114060&w=2


-
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/