diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-03-18 05:38:53 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-03-18 05:39:00 -0400 |
| commit | 8dd8997d2c56c9f248294805e129e1fc69444380 (patch) | |
| tree | 3b030a04295fc031db98746c4074c2df1ed6a19f /arch/x86/include/asm/kdebug.h | |
| parent | 1eda75c131ea42ec173323b6c34aeed78ae637c1 (diff) | |
| parent | 016aa2ed1cc9cf704cf76d8df07751b6daa9750f (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: Merge upstream commits to avoid conflicts in upcoming patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/kdebug.h')
| -rw-r--r-- | arch/x86/include/asm/kdebug.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/kdebug.h b/arch/x86/include/asm/kdebug.h index ca242d35e87..518bbbb9ee5 100644 --- a/arch/x86/include/asm/kdebug.h +++ b/arch/x86/include/asm/kdebug.h | |||
| @@ -13,7 +13,6 @@ enum die_val { | |||
| 13 | DIE_PANIC, | 13 | DIE_PANIC, |
| 14 | DIE_NMI, | 14 | DIE_NMI, |
| 15 | DIE_DIE, | 15 | DIE_DIE, |
| 16 | DIE_NMIWATCHDOG, | ||
| 17 | DIE_KERNELDEBUG, | 16 | DIE_KERNELDEBUG, |
| 18 | DIE_TRAP, | 17 | DIE_TRAP, |
| 19 | DIE_GPF, | 18 | DIE_GPF, |