diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-04 15:31:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-04 15:31:51 -0700 |
| commit | 9c66812b6bee225950431de51dfc9dc664905038 (patch) | |
| tree | 51eca731a6b58b9868e23977e4b337921e6805dc /kernel/panic.c | |
| parent | b5a7c9a0b3c5de22e1762120063daae9f91d5197 (diff) | |
| parent | e16852cfc5580b88cb327413ab8c89375f380592 (diff) | |
| download | linux-9c66812b6bee225950431de51dfc9dc664905038.tar.bz2 | |
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:
tracing: Fix missing function_graph events when we splice_read from trace_pipe
tracing: Fix invalid function_graph entry
trace: stop tracer in oops_enter()
ftrace: Only update $offset when we update $ref_func
ftrace: Fix the conditional that updates $ref_func
tracing: only truncate ftrace files when O_TRUNC is set
tracing: show proper address for trace-printk format
Diffstat (limited to 'kernel/panic.c')
| -rw-r--r-- | kernel/panic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/panic.c b/kernel/panic.c index 984b3ecbd72c..512ab73b0ca3 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -301,6 +301,7 @@ int oops_may_print(void) */ void oops_enter(void) { + tracing_off(); /* can't trust the integrity of the kernel anymore: */ debug_locks_off(); do_oops_enter_exit(); |