diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-23 05:25:31 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-23 05:25:31 -0400 |
| commit | 77a7f2e94e6998e307917fe63fa4b6d5162d44e9 (patch) | |
| tree | 1db43ac215fa9eac6ebb09cb0ddea5e3d285e132 /drivers/char | |
| parent | ac0053fd51d2bac09a7d4b4a59f6dac863bd4373 (diff) | |
| parent | cecbca96da387428e220e307a9c945e37e2f4d9e (diff) | |
Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/core
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/sysrq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c index 59de2525d303..d4e8b213a462 100644 --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c | |||
| @@ -289,7 +289,7 @@ static struct sysrq_key_op sysrq_showstate_blocked_op = { | |||
| 289 | 289 | ||
| 290 | static void sysrq_ftrace_dump(int key, struct tty_struct *tty) | 290 | static void sysrq_ftrace_dump(int key, struct tty_struct *tty) |
| 291 | { | 291 | { |
| 292 | ftrace_dump(); | 292 | ftrace_dump(DUMP_ALL); |
| 293 | } | 293 | } |
| 294 | static struct sysrq_key_op sysrq_ftrace_dump_op = { | 294 | static struct sysrq_key_op sysrq_ftrace_dump_op = { |
| 295 | .handler = sysrq_ftrace_dump, | 295 | .handler = sysrq_ftrace_dump, |