Messages in this thread Patch in this message | | | Subject | Re: [V7][PATCH 0/6] x86, nmi: new NMI handling routines | From | Peter Zijlstra <> | Date | Mon, 03 Oct 2011 17:47:18 +0200 |
| |
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, -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |