Re: [PATCH] Replace custom Dprintk macro with pr_debug - nmi.c

[Ingo Molnar]

looks good.

Acked-by: Ingo Molnar <mingo@xxxxxxx>

	Ingo

* Daniele Pizzoni <auouo@xxxxxx> wrote:

> Substituted custom Dprintk macro with pr_debug
> 
> Signed-off-by: Daniele Pizzoni
> 
> 
> Index: linux-2.6.9-rc4/arch/i386/kernel/nmi.c
> ===================================================================
> --- linux-2.6.9-rc4.orig/arch/i386/kernel/nmi.c	2004-10-18 19:41:13.798118432 +0200
> +++ linux-2.6.9-rc4/arch/i386/kernel/nmi.c	2004-10-18 21:50:57.884757392 +0200
> @@ -13,6 +13,8 @@
>   *  Mikael Pettersson	: PM converted to driver model. Disable/enable API.
>   */
>  
> +//#define DEBUG // pr_debug
> +#include <linux/kernel.h>
>  #include <linux/config.h>
>  #include <linux/mm.h>
>  #include <linux/irq.h>
> @@ -332,7 +334,7 @@ static void setup_k7_watchdog(void)
>  		| K7_NMI_EVENT;
>  
>  	wrmsr(MSR_K7_EVNTSEL0, evntsel, 0);
> -	Dprintk("setting K7_PERFCTR0 to %08lx\n", -(cpu_khz/nmi_hz*1000));
> +	pr_debug("setting K7_PERFCTR0 to %08lx\n", -(cpu_khz/nmi_hz*1000));
>  	wrmsr(MSR_K7_PERFCTR0, -(cpu_khz/nmi_hz*1000), -1);
>  	apic_write(APIC_LVTPC, APIC_DM_NMI);
>  	evntsel |= K7_EVNTSEL_ENABLE;
> @@ -354,7 +356,7 @@ static void setup_p6_watchdog(void)
>  		| P6_NMI_EVENT;
>  
>  	wrmsr(MSR_P6_EVNTSEL0, evntsel, 0);
> -	Dprintk("setting P6_PERFCTR0 to %08lx\n", -(cpu_khz/nmi_hz*1000));
> +	pr_debug("setting P6_PERFCTR0 to %08lx\n", -(cpu_khz/nmi_hz*1000));
>  	wrmsr(MSR_P6_PERFCTR0, -(cpu_khz/nmi_hz*1000), 0);
>  	apic_write(APIC_LVTPC, APIC_DM_NMI);
>  	evntsel |= P6_EVNTSEL0_ENABLE;
> @@ -395,7 +397,7 @@ static int setup_p4_watchdog(void)
>  
>  	wrmsr(MSR_P4_CRU_ESCR0, P4_NMI_CRU_ESCR0, 0);
>  	wrmsr(MSR_P4_IQ_CCCR0, P4_NMI_IQ_CCCR0 & ~P4_CCCR_ENABLE, 0);
> -	Dprintk("setting P4_IQ_COUNTER0 to 0x%08lx\n", -(cpu_khz/nmi_hz*1000));
> +	pr_debug("setting P4_IQ_COUNTER0 to 0x%08lx\n", -(cpu_khz/nmi_hz*1000));
>  	wrmsr(MSR_P4_IQ_COUNTER0, -(cpu_khz/nmi_hz*1000), -1);
>  	apic_write(APIC_LVTPC, APIC_DM_NMI);
>  	wrmsr(MSR_P4_IQ_CCCR0, nmi_p4_cccr_val, 0);
> 
-
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/