diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-28 17:52:25 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-28 17:52:25 +0100 |
| commit | e946217e4fdaa67681bbabfa8e6b18641921f750 (patch) | |
| tree | 057ad6cb5869e20db7b93f154319560b55cbc725 /include/asm-generic/kdebug.h | |
| parent | Merge branch 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | ftrace: fix current_tracer error return (diff) | |
| download | linux-e946217e4fdaa67681bbabfa8e6b18641921f750.tar.xz linux-e946217e4fdaa67681bbabfa8e6b18641921f750.zip | |
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (31 commits)
ftrace: fix current_tracer error return
tracing: fix a build error on alpha
ftrace: use a real variable for ftrace_nop in x86
tracing/ftrace: make boot tracer select the sched_switch tracer
tracepoint: check if the probe has been registered
asm-generic: define DIE_OOPS in asm-generic
trace: fix printk warning for u64
ftrace: warning in kernel/trace/ftrace.c
ftrace: fix build failure
ftrace, powerpc, sparc64, x86: remove notrace from arch ftrace file
ftrace: remove ftrace hash
ftrace: remove mcount set
ftrace: remove daemon
ftrace: disable dynamic ftrace for all archs that use daemon
ftrace: add ftrace warn on to disable ftrace
ftrace: only have ftrace_kill atomic
ftrace: use probe_kernel
ftrace: comment arch ftrace code
ftrace: return error on failed modified text.
ftrace: dynamic ftrace process only text section
...
Diffstat (limited to 'include/asm-generic/kdebug.h')
| -rw-r--r-- | include/asm-generic/kdebug.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-generic/kdebug.h b/include/asm-generic/kdebug.h index 2b799c90b2d4..11e57b6a85fc 100644 --- a/include/asm-generic/kdebug.h +++ b/include/asm-generic/kdebug.h @@ -3,6 +3,7 @@ enum die_val { DIE_UNUSED, + DIE_OOPS=1 }; #endif /* _ASM_GENERIC_KDEBUG_H */ |