lkml.org 
[lkml]   [2008]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] x86: cleanups to nmi_watchdog variable
[=?ISO-8859-2?Q?N=E9meth_M=E1rton_ - Sat, Jun 07, 2008 at 05:45:15PM +0200]
| From: Márton Németh <nm127@freemail.hu>
|
| Use NMI_NONE instead of 0. As the symbol NMI_DISABLED equals to -1,
| the nmi_watchdog variable should also be signed.
|
| Signed-off-by: Márton Németh <nm127@freemail.hu>
| ---
| diff -upr linux-2.6.26-rc5.orig/arch/x86/kernel/io_apic_32.c linux-2.6.26-rc5/arch/x86/kernel/io_apic_32.c
| --- linux-2.6.26-rc5.orig/arch/x86/kernel/io_apic_32.c 2008-06-07 12:35:24.000000000 +0200
| +++ linux-2.6.26-rc5/arch/x86/kernel/io_apic_32.c 2008-06-07 12:40:20.000000000 +0200
| @@ -2217,7 +2217,7 @@ static inline void __init check_timer(vo
|
| if (nmi_watchdog == NMI_IO_APIC) {
| printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n");
| - nmi_watchdog = 0;
| + nmi_watchdog = NMI_NONE;
| }
|
| printk(KERN_INFO "...trying to set up timer as Virtual Wire IRQ...");
| diff -upr linux-2.6.26-rc5.orig/arch/x86/kernel/io_apic_64.c linux-2.6.26-rc5/arch/x86/kernel/io_apic_64.c
| --- linux-2.6.26-rc5.orig/arch/x86/kernel/io_apic_64.c 2008-06-05 18:39:49.000000000 +0200
| +++ linux-2.6.26-rc5/arch/x86/kernel/io_apic_64.c 2008-06-07 12:37:01.000000000 +0200
| @@ -1735,7 +1735,7 @@ static inline void __init check_timer(vo
|
| if (nmi_watchdog == NMI_IO_APIC) {
| printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n");
| - nmi_watchdog = 0;
| + nmi_watchdog = NMI_NONE;
| }
|
| apic_printk(APIC_VERBOSE, KERN_INFO "...trying to set up timer as Virtual Wire IRQ...");
| diff -upr linux-2.6.26-rc5.orig/arch/x86/kernel/nmi_32.c linux-2.6.26-rc5/arch/x86/kernel/nmi_32.c
| --- linux-2.6.26-rc5.orig/arch/x86/kernel/nmi_32.c 2008-06-05 18:39:49.000000000 +0200
| +++ linux-2.6.26-rc5/arch/x86/kernel/nmi_32.c 2008-06-07 11:19:55.000000000 +0200
| @@ -43,7 +43,7 @@ static cpumask_t backtrace_mask = CPU_MA
| */
| atomic_t nmi_active = ATOMIC_INIT(0); /* oprofile uses this */
|
| -unsigned int nmi_watchdog = NMI_DEFAULT;
| +int nmi_watchdog = NMI_DEFAULT;
| static unsigned int nmi_hz = HZ;
|
| static DEFINE_PER_CPU(short, wd_enabled);
| diff -upr linux-2.6.26-rc5.orig/arch/x86/kernel/nmi_64.c linux-2.6.26-rc5/arch/x86/kernel/nmi_64.c
| --- linux-2.6.26-rc5.orig/arch/x86/kernel/nmi_64.c 2008-06-05 18:39:49.000000000 +0200
| +++ linux-2.6.26-rc5/arch/x86/kernel/nmi_64.c 2008-06-07 11:20:00.000000000 +0200
| @@ -43,7 +43,7 @@ static cpumask_t backtrace_mask = CPU_MA
| atomic_t nmi_active = ATOMIC_INIT(0); /* oprofile uses this */
| static int panic_on_timeout;
|
| -unsigned int nmi_watchdog = NMI_DEFAULT;
| +int nmi_watchdog = NMI_DEFAULT;
| static unsigned int nmi_hz = HZ;
|
| static DEFINE_PER_CPU(short, wd_enabled);
| diff -upr linux-2.6.26-rc5.orig/include/asm-x86/nmi.h linux-2.6.26-rc5/include/asm-x86/nmi.h
| --- linux-2.6.26-rc5.orig/include/asm-x86/nmi.h 2008-06-05 18:40:12.000000000 +0200
| +++ linux-2.6.26-rc5/include/asm-x86/nmi.h 2008-06-07 11:21:20.000000000 +0200
| @@ -61,7 +61,7 @@ extern void enable_timer_nmi_watchdog(vo
| extern int nmi_watchdog_tick(struct pt_regs *regs, unsigned reason);
|
| extern atomic_t nmi_active;
| -extern unsigned int nmi_watchdog;
| +extern int nmi_watchdog;
| #define NMI_DISABLED -1
| #define NMI_NONE 0
| #define NMI_IO_APIC 1
|

Good catch! Actually 0 -> NMI_NONE change already in -tip tree.
Sign/signess mark - is good to be investigated. Thanks!

- Cyrill -
--
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/

\
 
 \ /
  Last update: 2008-06-07 18:35    [W:0.073 / U:0.280 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site