From: Ingo Molnar <mingo@elte.hu>
To: Daniele Pizzoni <auouo@tin.it>
Cc: kernel-janitors <kernel-janitors@lists.osdl.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] Replace custom Dprintk macro with pr_debug - nmi.c
Date: Mon, 18 Oct 2004 21:04:17 +0200 [thread overview]
Message-ID: <20041018190417.GA5845@elte.hu> (raw)
In-Reply-To: <1098129428.3024.61.camel@pdp11.tsho.org>
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);
>
prev parent reply other threads:[~2004-10-18 19:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20041018190417.GA5845@elte.hu \
--to=mingo@elte.hu \
--cc=auouo@tin.it \
--cc=kernel-janitors@lists.osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox