The patch titled ftrace: ftrace_printk doc moved has been removed from the -mm tree. Its filename was ftrace-printk-formatting-infrastructure-fix.patch This patch was dropped because it was folded into ftrace-printk-formatting-infrastructure.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: ftrace: ftrace_printk doc moved From: Steven Rostedt <rostedt@xxxxxxxxxxx> Based on Randy Dunlap's suggestion, the ftrace_printk kernel-doc belongs with the ftrace_printk macro that should be used. Not with the __ftrace_printk internal function. Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Acked-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/ftrace.h | 18 +++++++++++++++++- kernel/trace/trace.c | 16 ---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff -puN include/linux/ftrace.h~ftrace-printk-formatting-infrastructure-fix include/linux/ftrace.h --- a/include/linux/ftrace.h~ftrace-printk-formatting-infrastructure-fix +++ a/include/linux/ftrace.h @@ -157,7 +157,23 @@ static inline void __ftrace_enabled_rest #ifdef CONFIG_TRACING extern void ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3); -# define ftrace_printk(x...) __ftrace_printk(_THIS_IP_, x) +/** + * ftrace_printk - printf formatting in the ftrace buffer + * @fmt: the printf format for printing + * + * Note: __ftrace_printk is an internal function for ftrace_printk and + * the @ip is passed in via the ftrace_printk macro. + * + * This function allows a kernel developer to debug fast path sections + * that printk is not appropriate for. By scattering in various + * printk like tracing in the code, a developer can quickly see + * where problems are occurring. + * + * This is intended as a debugging tool for the developer only. + * Please refrain from leaving ftrace_printks scattered around in + * your code. + */ +# define ftrace_printk(fmt...) __ftrace_printk(_THIS_IP_, fmt) extern int __ftrace_printk(unsigned long ip, const char *fmt, ...) __attribute__ ((format (printf, 2, 3))); diff -puN kernel/trace/trace.c~ftrace-printk-formatting-infrastructure-fix kernel/trace/trace.c --- a/kernel/trace/trace.c~ftrace-printk-formatting-infrastructure-fix +++ a/kernel/trace/trace.c @@ -3075,22 +3075,6 @@ static __init void tracer_init_debugfs(v (sizeof(struct trace_field) - offsetof(struct trace_field, print.buf)) #define TRACE_CONT_BUF_SIZE sizeof(struct trace_field) -/** - * ftrace_printk - printf formatting in the ftrace buffer - * @fmt - the printf format for printing. - * - * Note: __ftrace_printk is an internal function for ftrace_printk and - * the @ip is passed in via the ftrace_printk macro. - * - * This function allows a kernel developer to debug fast path sections - * that printk is not appropriate for. By scattering in various - * printk like tracing in the code, a developer can quickly see - * where problems are occurring. - * - * This is intended as a debugging tool for the developer only. - * Please reframe from leaving ftrace_printks scattered around in - * your code. - */ int __ftrace_printk(unsigned long ip, const char *fmt, ...) { struct trace_array *tr = &global_trace; _ Patches currently in -mm which might be from rostedt@xxxxxxxxxxx are origin.patch linux-next.patch rcu-just-rename-call_rcu_bh-instead-of-making-it-a-macro.patch rcu-trace-fix-possible-mem-leak.patch ftrace-new-continue-entry-separate-out-from-trace_entry.patch ftrace-printk-formatting-infrastructure.patch ftrace-printk-formatting-infrastructure-fix.patch ftrace-printk-formatting-infrastructure-fix-fix.patch ftrace-disable-function-tracing-bringing-up-new-cpu.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html