projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[powerpc.git]
/
include
/
asm-ia64
/
kdebug.h
diff --git
a/include/asm-ia64/kdebug.h
b/include/asm-ia64/kdebug.h
index
218c458
..
c195a9a
100644
(file)
--- a/
include/asm-ia64/kdebug.h
+++ b/
include/asm-ia64/kdebug.h
@@
-58,6
+58,8
@@
enum die_val {
DIE_MCA_RENDZVOUS_ENTER,
DIE_MCA_RENDZVOUS_PROCESS,
DIE_MCA_RENDZVOUS_LEAVE,
+ DIE_MCA_NEW_TIMEOUT,
+ DIE_INIT_ENTER,
DIE_INIT_MONARCH_ENTER,
DIE_INIT_MONARCH_PROCESS,
DIE_INIT_MONARCH_LEAVE,