From: Peter Zijlstra <peterz@infradead.org>
To: Don Zickus <dzickus@redhat.com>
Cc: x86@kernel.org, Andi Kleen <andi@firstfloor.org>,
Robert Richter <robert.richter@amd.com>,
ying.huang@intel.com, LKML <linux-kernel@vger.kernel.org>,
paulmck@linux.vnet.ibm.com, avi@redhat.com, jeremy@goop.org
Subject: Re: [V7][PATCH 0/6] x86, nmi: new NMI handling routines
Date: Mon, 03 Oct 2011 17:47:18 +0200 [thread overview]
Message-ID: <1317656838.20367.28.camel@twins> (raw)
In-Reply-To: <1317409584-23662-1-git-send-email-dzickus@redhat.com>
I fixed up:
drivers/watchdog/hpwdt.c: In function ‘hpwdt_init_nmi_decoding’:
drivers/watchdog/hpwdt.c:734: error: ‘NMI_HANDLE_FIRST’ undeclared (first use in this function)
drivers/watchdog/hpwdt.c:734: error: (Each undeclared identifier is reported only once
drivers/watchdog/hpwdt.c:734: error: for each function it appears in.)
drivers/watchdog/hpwdt.c:735: warning: passing argument 2 of ‘register_nmi_handler’ from incompatible pointer type
---
Index: linux-2.6/drivers/watchdog/hpwdt.c
===================================================================
--- linux-2.6.orig/drivers/watchdog/hpwdt.c
+++ linux-2.6/drivers/watchdog/hpwdt.c
@@ -477,8 +477,7 @@ static int hpwdt_time_left(void)
/*
* NMI Handler
*/
-static int hpwdt_pretimeout(unsigned int ulReason, struct pt_regs *regs,
- void *data)
+static int hpwdt_pretimeout(unsigned int ulReason, struct pt_regs *regs)
{
unsigned long rom_pl;
static int die_nmi_called;
@@ -731,7 +730,7 @@ static int __devinit hpwdt_init_nmi_deco
* be last so other users of the NMI signal can function.
*/
retval = register_nmi_handler(NMI_UNKNOWN, hpwdt_pretimeout,
- (priority) ? NMI_HANDLE_FIRST : 0,
+ (priority) ? NMI_FLAG_FIRST : 0,
"hpwdt");
if (retval != 0) {
dev_warn(&dev->dev,
next prev parent reply other threads:[~2011-10-03 15:48 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-30 19:06 [V7][PATCH 0/6] x86, nmi: new NMI handling routines Don Zickus
2011-09-30 19:06 ` [V7][PATCH 1/6] x86, nmi: split out nmi from traps.c Don Zickus
2011-09-30 19:06 ` [V7][PATCH 2/6] x86, nmi: create new NMI handler routines Don Zickus
2011-09-30 19:06 ` [V7][PATCH 3/6] x86, nmi: wire up NMI handlers to new routines Don Zickus
2011-09-30 19:06 ` [V7][PATCH 4/6] x86, nmi: add in logic to handle multiple events and unknown NMIs Don Zickus
2011-09-30 19:06 ` [V7][PATCH 5/6] x86, nmi: track NMI usage stats Don Zickus
2011-09-30 19:06 ` [V7][PATCH 6/6] x86, nmi: print out NMI stats in /proc/interrupts Don Zickus
2011-10-03 15:47 ` Peter Zijlstra [this message]
2011-10-03 15:52 ` [V7][PATCH 0/6] x86, nmi: new NMI handling routines Peter Zijlstra
2011-10-03 15:56 ` Don Zickus
2011-10-03 15:59 ` Peter Zijlstra
2011-10-04 15:05 ` Robert Richter
2011-10-04 16:43 ` Peter Zijlstra
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=1317656838.20367.28.camel@twins \
--to=peterz@infradead.org \
--cc=andi@firstfloor.org \
--cc=avi@redhat.com \
--cc=dzickus@redhat.com \
--cc=jeremy@goop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=robert.richter@amd.com \
--cc=x86@kernel.org \
--cc=ying.huang@intel.com \
/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