aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace_kdb.c
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2015-01-30 10:16:33 +0100
committerJan Kara <jack@suse.cz>2015-01-30 10:16:33 +0100
commit1cd6b7be92016538ea1f2a8e1f955e9b974d93ea (patch)
tree77ca10be1da7aaf19cde95de0cb9c4bfcde636a0 /kernel/trace/trace_kdb.c
parentxfs: Remove some pointless quota checks (diff)
parentquota: Switch ->get_dqblk() and ->set_dqblk() to use bytes as space units (diff)
downloadlinux-dev-1cd6b7be92016538ea1f2a8e1f955e9b974d93ea.tar.xz
linux-dev-1cd6b7be92016538ea1f2a8e1f955e9b974d93ea.zip
Merge branch 'for_linus' into for_next
Diffstat (limited to 'kernel/trace/trace_kdb.c')
-rw-r--r--kernel/trace/trace_kdb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace_kdb.c b/kernel/trace/trace_kdb.c
index b0b1c44e923a..3ccf5c2c1320 100644
--- a/kernel/trace/trace_kdb.c
+++ b/kernel/trace/trace_kdb.c
@@ -132,8 +132,8 @@ static int kdb_ftdump(int argc, const char **argv)
static __init int kdb_ftrace_register(void)
{
- kdb_register_repeat("ftdump", kdb_ftdump, "[skip_#lines] [cpu]",
- "Dump ftrace log", 0, KDB_REPEAT_NONE);
+ kdb_register_flags("ftdump", kdb_ftdump, "[skip_#lines] [cpu]",
+ "Dump ftrace log", 0, KDB_ENABLE_ALWAYS_SAFE);
return 0;
}