summaryrefslogtreecommitdiffstats
path: root/include/asm-x86/nmi.h
Commit message (Expand)AuthorAgeFilesLines
*-. Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/cr...Ingo Molnar2008-10-061-0/+1
|\ \
| | * x86, NMI watchdog: setup before enabling NMI watchdogAristeu Rozanski2008-09-221-0/+1
| |/
* | x86: consolidate header guardsVegard Nossum2008-07-221-3/+3
|/
* x86: nmi_watchdog - introduce nmi_watchdog_active() helperCyrill Gorcunov2008-07-081-0/+13
* x86: nmi_watchdog - use NMI_NONE by defaultCyrill Gorcunov2008-07-081-3/+0
* Merge branch 'x86/nmi' into x86/develIngo Molnar2008-07-081-4/+2
|\
| * x86: nmi - consolidate nmi_watchdog_default for 32bit modeCyrill Gorcunov2008-06-051-3/+1
| * - fix typo in include/asm-x86/nmi.hIngo Molnar2008-05-301-1/+1
| * x86: nmi - fix incorrect NMI watchdog used by defaultCyrill Gorcunov2008-05-281-1/+3
| * x86: nmi_32.c - add nmi_watchdog_default helperCyrill Gorcunov2008-05-251-3/+1
| * x86: nmi - unify die_nmi() interfaceCyrill Gorcunov2008-05-251-1/+1
| * x86: remove duplicate declaration of unknown_nmi_panicFernando Luis Vazquez Cao2008-05-251-1/+0
| |
| \
*-. \ Merge branches 'x86/numa-fixes', 'x86/apic', 'x86/apm', 'x86/bitops', 'x86/bu...Ingo Molnar2008-07-081-22/+5
|\ \ \ | |_|/ |/| |
| | * x86: remove obsolete PM definitions from NMI headerRafael J. Wysocki2008-06-121-21/+0
| | * x86: cleanup, remove duplicate declaration of unknown_nmi_panicFernando Luis Vazquez Cao2008-05-251-1/+0
| |/ |/|
| * x86: NMI watchdog: Downgrade helperMaciej W. Rozycki2008-07-081-0/+5
|/
* x86: call nmi_watchdog_default in i386Glauber de Oliveira Costa2008-04-171-1/+3
* x86: unify nmi_32.h and nmi_64.hGlauber de Oliveira Costa2008-04-171-3/+89
* i386/x86_64: move headers to include/asm-x86Thomas Gleixner2007-10-111-0/+5
OpenPOWER on IntegriCloud