From 5d6a7a9c60d0fa47d2d936672c63b2bf89beafc4 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Mon, 14 Sep 2009 11:18:02 -0400 Subject: [PATCH] --- yaml --- r: 162969 b: refs/heads/master c: a48f494e1dbdcf4fb7c02100ae3208c4c1daecbf h: refs/heads/master i: 162967: 144f4775ec590d26d70af4e94c2ef01ef2925b27 v: v3 --- [refs] | 2 +- trunk/include/trace/ftrace.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 321dec101417..98c24447248e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec827c7ece8901044e6b3f92aeea489be9e1bcf7 +refs/heads/master: a48f494e1dbdcf4fb7c02100ae3208c4c1daecbf diff --git a/trunk/include/trace/ftrace.h b/trunk/include/trace/ftrace.h index fa8ce03f836c..72a3b437b829 100644 --- a/trunk/include/trace/ftrace.h +++ b/trunk/include/trace/ftrace.h @@ -239,9 +239,9 @@ ftrace_format_##call(struct ftrace_event_call *unused, \ #undef __print_flags #define __print_flags(flag, delim, flag_array...) \ ({ \ - static const struct trace_print_flags flags[] = \ + static const struct trace_print_flags __flags[] = \ { flag_array, { -1, NULL }}; \ - ftrace_print_flags_seq(p, delim, flag, flags); \ + ftrace_print_flags_seq(p, delim, flag, __flags); \ }) #undef __print_symbolic