[PATCH] x86: cleanups to nmi_watchdog variable

Previous thread: [patch 4/5] sparse: leds-h1940.c: make non-exported symbols static by Ben Dooks on Saturday, June 7, 2008 - 8:36 am. (2 messages)

Next thread: [patch 1/2] x86: io-apic - define names for redirection table entry fields by Cyrill Gorcunov on Saturday, June 7, 2008 - 8:53 am. (2 messages)

[view original message]

From: Németh Márton

Subject: [PATCH] x86: cleanups to nmi_watchdog variable

Date: Saturday, June 7, 2008 - 8:45 am

From: Márton Németh &lt;nm127@freemail.hu&gt;

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 &lt;nm127@freemail.hu&gt;
---
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 &quot;timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n&quot;);
-		nmi_watchdog = 0;
+		nmi_watchdog = NMI_NONE;
 	}

 	printk(KERN_INFO &quot;...trying to set up timer as Virtual Wire IRQ...&quot;);
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 &quot;timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n&quot;);
-		nmi_watchdog = 0;
+		nmi_watchdog = NMI_NONE;
 	}

 	apic_printk(APIC_VERBOSE, KERN_INFO &quot;...trying to set up timer as Virtual Wire IRQ...&quot;);
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 ...[ message continues ]

[view original message]

From: Cyrill Gorcunov

Subject: Re: [PATCH] x86: cleanups to nmi_watchdog variable

Date: Saturday, June 7, 2008 - 9:32 am

[=?ISO-8859-2?Q?N=E9meth_M=E1rton_ - Sat, Jun 07, 2008 at 05:45:15PM +0200]
| From: Márton Németh &lt;nm127@freemail.hu&gt;
| 
| 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 &lt;nm127@freemail.hu&gt;
| ---
| 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 &quot;timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n&quot;);
| -		nmi_watchdog = 0;
| +		nmi_watchdog = NMI_NONE;
|  	}
| 
|  	printk(KERN_INFO &quot;...trying to set up timer as Virtual Wire IRQ...&quot;);
| 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 &quot;timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n&quot;);
| -		nmi_watchdog = 0;
| +		nmi_watchdog = NMI_NONE;
|  	}
| 
|  	apic_printk(APIC_VERBOSE, KERN_INFO &quot;...trying to set up timer as Virtual Wire IRQ...&quot;);
| 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 ...[ message continues ]

[view original message]

From: Cyrill Gorcunov

Subject: Re: [PATCH] x86: cleanups to nmi_watchdog variable

Date: Sunday, June 8, 2008 - 8:56 am

| From: Márton Németh &lt;nm127@freemail.hu&gt;
| 
| 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 &lt;nm127@freemail.hu&gt;
| ---
| 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 &quot;timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n&quot;);
| -		nmi_watchdog = 0;
| +		nmi_watchdog = NMI_NONE;
|  	}
| 
|  	printk(KERN_INFO &quot;...trying to set up timer as Virtual Wire IRQ...&quot;);
| 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 &quot;timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n&quot;);
| -		nmi_watchdog = 0;
| +		nmi_watchdog = NMI_NONE;
|  	}
| 
|  	apic_printk(APIC_VERBOSE, KERN_INFO &quot;...trying to set up timer as Virtual Wire IRQ...&quot;);
| 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;
|  ...[ message continues ]

[view original message]

From: Németh Márton

Subject: Re: [PATCH] x86: cleanups to nmi_watchdog variable

Date: Sunday, June 8, 2008 - 9:23 am

Don't forget that the NMI_DEFAULT symbol in include/asm-x86/nmi.h also equals to
NMI_DISABLED, which is -1.

	Márton Németh

--

[ message continues ]

[view original message]

From: Cyrill Gorcunov

Subject: Re: [PATCH] x86: cleanups to nmi_watchdog variable

Date: Sunday, June 8, 2008 - 9:31 am

[=?ISO-8859-1?Q?N=E9meth_M=E1rton_ - Sun, Jun 08, 2008 at 06:23:38PM +0200]
| Cyrill Gorcunov wrote:
| &gt; | From: Márton Németh &lt;nm127@freemail.hu&gt;
| &gt; | 
| &gt; | Use NMI_NONE instead of 0. As the symbol NMI_DISABLED equals to -1,
| &gt; | the nmi_watchdog variable should also be signed.
| &gt; | 
| &gt; | Signed-off-by: Márton Németh &lt;nm127@freemail.hu&gt;
| &gt; | ---
| &gt; | 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
| &gt; | --- linux-2.6.26-rc5.orig/arch/x86/kernel/io_apic_32.c	2008-06-07 12:35:24.000000000 +0200
| &gt; | +++ linux-2.6.26-rc5/arch/x86/kernel/io_apic_32.c	2008-06-07 12:40:20.000000000 +0200
| &gt; | @@ -2217,7 +2217,7 @@ static inline void __init check_timer(vo
| &gt; | 
| &gt; |  	if (nmi_watchdog == NMI_IO_APIC) {
| &gt; |  		printk(KERN_WARNING &quot;timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n&quot;);
| &gt; | -		nmi_watchdog = 0;
| &gt; | +		nmi_watchdog = NMI_NONE;
| &gt; |  	}
| &gt; | 
| &gt; |  	printk(KERN_INFO &quot;...trying to set up timer as Virtual Wire IRQ...&quot;);
| &gt; | 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
| &gt; | --- linux-2.6.26-rc5.orig/arch/x86/kernel/io_apic_64.c	2008-06-05 18:39:49.000000000 +0200
| &gt; | +++ linux-2.6.26-rc5/arch/x86/kernel/io_apic_64.c	2008-06-07 12:37:01.000000000 +0200
| &gt; | @@ -1735,7 +1735,7 @@ static inline void __init check_timer(vo
| &gt; | 
| &gt; |  	if (nmi_watchdog == NMI_IO_APIC) {
| &gt; |  		printk(KERN_WARNING &quot;timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n&quot;);
| &gt; | -		nmi_watchdog = 0;
| &gt; | +		nmi_watchdog = NMI_NONE;
| &gt; |  	}
| &gt; | 
| &gt; |  	apic_printk(APIC_VERBOSE, KERN_INFO &quot;...trying to set up timer as Virtual Wire IRQ...&quot;);
| &gt; | 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
| &gt; | --- linux-2.6.26-rc5.orig/arch/x86/kernel/nmi_32.c	2008-06-05 18:39:49.000000000 +0200
| &gt; | +++ linux-2.6.26-rc5/arch/x86/kernel/nmi_32.c	2008-06-07 11:19:55.000000000 ...[ message continues ]

[view original message]

From: Cyrill Gorcunov

Subject: Re: [PATCH] x86: cleanups to nmi_watchdog variable

Date: Sunday, June 8, 2008 - 1:28 pm

that -1 is the 0xff... form of presentation for unsigned type. And
thanks for catching this. It defenitely should be simplified once.

--

[ message continues ]


linux-kernel:
Greg KH	Og dreams of kernels
Jens Axboe	[PATCH 31/33] Fusion: sg chaining support
Arnd Bergmann	Re: finding your own dead "CONFIG_" variables
Mark Brown	[PATCH 2/2] Subject: natsemi: Allow users to disable workaround for DspCfg reset
Tony Breeds