starred/linux-legacy
1
0
Fork 0
mirror of https://github.com/genesi/linux-legacy.git synced 2026-05-20 22:06:45 +00:00
Code Issues 2 Packages Projects Releases Wiki Activity

Merge branch 'tracing/core-v2' into tracing-for-linus

Browse Source 
Conflicts:
	include/linux/slub_def.h
	lib/Kconfig.debug
	mm/slob.c
	mm/slub.c
This commit is contained in:
Ingo Molnar
2009-04-01 21:54:19 +02:00
parent 4fe70410d9 2e572895bf
commit 8302294f43
149 changed files with 14659 additions and 3726 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/char/sysrq.c
View File

@@ -283,7 +283,7 @@ static void sysrq_ftrace_dump(int key, struct tty_struct *tty)
}
static struct sysrq_key_op sysrq_ftrace_dump_op = {
.handler = sysrq_ftrace_dump,
.help_msg = "dumpZ-ftrace-buffer",
.help_msg = "dump-ftrace-buffer(Z)",
.action_msg = "Dump ftrace buffer",
.enable_mask = SYSRQ_ENABLE_DUMP,
};