Merge branch 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm

[safe/jmp/linux-2.6] / include / asm-x86 / kdebug.h

diff --git a/include/asm-x86/kdebug.h b/include/asm-x86/kdebug.h
index 0c41753..96651bb 100644 (file)
--- a/include/asm-x86/kdebug.h
+++ b/include/asm-x86/kdebug.h
@@ -20,6 +20,7 @@ enum die_val {
        DIE_CALL,
        DIE_NMI_IPI,
        DIE_PAGE_FAULT,
+       DIE_NMIUNKNOWN,
 };
 
 extern void printk_address(unsigned long address, int reliable);