linux-toradex.git/include/asm-x86/nmi.h, branch v2.6.27.27

x86: nmi_watchdog - introduce nmi_watchdog_active() helper

2008-07-08T10:51:42+00:00

Signed-off-by: Cyrill Gorcunov 
Cc: macro@linux-mips.org
Signed-off-by: Ingo Molnar

x86: nmi_watchdog - use NMI_NONE by default

2008-07-08T10:51:41+00:00

There is no need to keep NMI_DISABLED definition and use it
for nmi_watchdog by default. Here is the point why:

- IO-APIC and APIC chips are programmed for nmi_watchdog support at very
  early stage of kernel booting and not having nmi_watchdog specified as
  boot option lead only to nmi_watchdog becomes to NMI_NONE anyway
- enable nmi_watchdog thru /proc/sys/kernel/nmi if it was not specified at
  boot is not possible too (even having this sysfs entry)

Signed-off-by: Cyrill Gorcunov 
Cc: macro@linux-mips.org
Signed-off-by: Ingo Molnar

Merge branch 'x86/nmi' into x86/devel

2008-07-08T10:17:08+00:00

Conflicts:

	arch/x86/kernel/nmi.c
	arch/x86/kernel/nmi_32.c

Signed-off-by: Ingo Molnar

Merge branches 'x86/numa-fixes', 'x86/apic', 'x86/apm', 'x86/bitops', 'x86/build', 'x86/cleanups', 'x86/cpa', 'x86/cpu', 'x86/defconfig', 'x86/gart', 'x86/i8259', 'x86/intel', 'x86/irqstats', 'x86/kconfig', 'x86/ldt', 'x86/mce', 'x86/memtest', 'x86/pat', 'x86/ptemask', 'x86/resumetrace', 'x86/threadinfo', 'x86/timers', 'x86/vdso' and 'x86/xen' into x86/devel

2008-07-08T07:16:56+00:00

x86: NMI watchdog: Downgrade helper

2008-07-08T07:13:16+00:00

A downgrade helper for the NMI watchdog to be used in all places where
the I/O APIC watchdog may have been requested, but the I/O APIC is found
not to be there or meant to be left disabled.  This is so that the
reconfiguration is cosistent and defined in a single place only.

Signed-off-by: Maciej W. Rozycki 
Signed-off-by: Ingo Molnar

x86: remove obsolete PM definitions from NMI header

2008-06-12T09:14:58+00:00

Remove obsolete and no longer used PM-related definitions from
include/asm-x86/nmi.h.

Signed-off-by: Rafael J. Wysocki 
Signed-off-by: Ingo Molnar

x86: nmi - consolidate nmi_watchdog_default for 32bit mode

2008-06-05T13:13:59+00:00

64bit mode bootstrap code does set nmi_watchdog to NMI_NONE
by default and doing the same on 32bit mode is safe too.
Such an action saves us from several #ifdef.

Btw, my previous commit

commit 19ec673ced067316b9732bc6d1c4ff4052e5f795
Author: Cyrill Gorcunov 
Date:   Wed May 28 23:00:47 2008 +0400

    x86: nmi - fix incorrect NMI watchdog used by default

did not fix the problem completely, moreover it
introduced additional bug - nmi_watchdog would be
set to either NMI_LOCAL_APIC or NMI_IO_APIC
_regardless_ to boot option if being enabled thru
/proc/sys/kernel/nmi_watchdog. Sorry for that.
Fix it too.

Signed-off-by: Cyrill Gorcunov 
Cc: mingo@redhat.com
Cc: hpa@zytor.com
Cc: macro@linux-mips.org
Signed-off-by: Thomas Gleixner

- fix typo in include/asm-x86/nmi.h

2008-05-30T12:55:47+00:00

x86: nmi - fix incorrect NMI watchdog used by default

2008-05-28T19:04:53+00:00

The commit

	commit 4b82b277707a39b97271439c475f186f63ec4692
	Author: Cyrill Gorcunov 
	Date:   Sat May 24 19:36:35 2008 +0400

set nmi_watchdog to NMI_IO_APIC as by default. This causes hangs on some
machines with buggy watchdogs. Fix it - i.e. restore old behaviour.

Thanks to Sitsofe Wheeler and Adrian Bunk for catching the problem
and Maciej W. Rozycki for explanation what is going on there.

Signed-off-by: Cyrill Gorcunov 
CC: Maciej W. Rozycki 
Signed-off-by: Ingo Molnar

x86: nmi_32.c - add nmi_watchdog_default helper

2008-05-25T20:32:51+00:00

Signed-off-by: Cyrill Gorcunov 
Cc: hpa@zytor.com
Cc: mingo@redhat.com
Signed-off-by: Thomas Gleixner