git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
sparc
/
include
/
asm
/
kdebug_64.h
diff --git
a/arch/sparc/include/asm/kdebug_64.h
b/arch/sparc/include/asm/kdebug_64.h
index f905b773235a2f977db3383559629d4fbd3e4fda..feb3578e12c4f5ce6a0e0a3d340fe913a7c36501 100644
(file)
--- a/
arch/sparc/include/asm/kdebug_64.h
+++ b/
arch/sparc/include/asm/kdebug_64.h
@@
-14,6
+14,8
@@
enum die_val {
DIE_TRAP,
DIE_TRAP_TL1,
DIE_CALL,
+ DIE_NMI,
+ DIE_NMIWATCHDOG,
};
#endif