From 16dfcdda24814ce0a4fbf3661d3fc95cb0620dd7 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Mon, 9 Mar 2009 10:11:36 +0100 Subject: [PATCH] --- yaml --- r: 140891 b: refs/heads/master c: 7bffc23e56e92c14b787bf4d95249a32085bfed5 h: refs/heads/master i: 140889: 33ec0e3c5dd694bfafa00896f7047c5b40e25725 140887: 414d5382264b24ba99c3c508d571a48173cd4327 v: v3 --- [refs] | 2 +- trunk/include/linux/kernel.h | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 24841404d9aa..70352e44426b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a20d84d09ab5d121f989cd99e4fc5f4b49f98ba +refs/heads/master: 7bffc23e56e92c14b787bf4d95249a32085bfed5 diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h index 4e726b9a71ec..7742798c9208 100644 --- a/trunk/include/linux/kernel.h +++ b/trunk/include/linux/kernel.h @@ -454,7 +454,10 @@ do { \ do { \ static const char *trace_printk_fmt \ __attribute__((section("__trace_printk_fmt"))); \ - trace_printk_fmt = fmt; \ + \ + if (!trace_printk_fmt) \ + trace_printk_fmt = fmt; \ + \ __trace_printk_check_format(fmt, ##args); \ __trace_printk(_THIS_IP_, trace_printk_fmt, ##args); \ } while (0) @@ -467,7 +470,10 @@ __trace_printk(unsigned long ip, const char *fmt, ...) do { \ static const char *trace_printk_fmt \ __attribute__((section("__trace_printk_fmt"))); \ - trace_printk_fmt = fmt; \ + \ + if (!trace_printk_fmt) \ + trace_printk_fmt = fmt; \ + \ __ftrace_vprintk(_THIS_IP_, trace_printk_fmt, vargs); \ } while (0)