* Re: [PATCH] Replace custom Dprintk macro with pr_debug - nmi.c
2004-10-18 19:57 [PATCH] Replace custom Dprintk macro with pr_debug - nmi.c Daniele Pizzoni
@ 2004-10-18 19:04 ` Ingo Molnar
0 siblings, 0 replies; 2+ messages in thread
From: Ingo Molnar @ 2004-10-18 19:04 UTC (permalink / raw)
To: Daniele Pizzoni; +Cc: kernel-janitors, LKML
looks good.
Acked-by: Ingo Molnar <mingo@elte.hu>
Ingo
* Daniele Pizzoni <auouo@tin.it> 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);
>
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH] Replace custom Dprintk macro with pr_debug - nmi.c
@ 2004-10-18 19:57 Daniele Pizzoni
2004-10-18 19:04 ` Ingo Molnar
0 siblings, 1 reply; 2+ messages in thread
From: Daniele Pizzoni @ 2004-10-18 19:57 UTC (permalink / raw)
To: Ingo Molnar; +Cc: kernel-janitors, LKML
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);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-10-18 19:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-10-18 19:57 [PATCH] Replace custom Dprintk macro with pr_debug - nmi.c Daniele Pizzoni
2004-10-18 19:04 ` Ingo Molnar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox