| Message ID | 20240606081846.4cb82dc4@gandalf.local.home (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2f6b884dfcc55065b76d2bf1e2424b93991ae92d |
| Headers | show |
| Series | function_graph: Rename BYTE_NUMBER to CHAR_NUMBER in selftests | expand |
On Thu, 6 Jun 2024 08:18:46 -0400 Steven Rostedt <rostedt@goodmis.org> wrote: > From: "Steven Rostedt (Google)" <rostedt@goodmis.org> > > The function_graph selftests checks various size variables to pass from > the entry of the function to the exit. It tests 1, 2, 4 and 8 byte words. > The 1 byte macro was called BYTE_NUMBER but that is used in the sh > architecture: arch/sh/include/asm/bitops-op32.h > > Just rename the macro to CHAR_NUMBER. > Looks good to me. Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> Thanks, > Fixes: 47c3c70aa3697 ("function_graph: Add selftest for passing local variables") > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/oe-kbuild-all/202406061744.rZDXfRrG-lkp@intel.com/ > Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> > --- > kernel/trace/trace_selftest.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c > index 369efc569238..adf0f436d84b 100644 > --- a/kernel/trace/trace_selftest.c > +++ b/kernel/trace/trace_selftest.c > @@ -758,7 +758,7 @@ trace_selftest_startup_function(struct tracer *trace, struct trace_array *tr) > > #ifdef CONFIG_DYNAMIC_FTRACE > > -#define BYTE_NUMBER 123 > +#define CHAR_NUMBER 123 > #define SHORT_NUMBER 12345 > #define WORD_NUMBER 1234567890 > #define LONG_NUMBER 1234567890123456789LL > @@ -789,7 +789,7 @@ static __init int store_entry(struct ftrace_graph_ent *trace, > > switch (size) { > case 1: > - *(char *)p = BYTE_NUMBER; > + *(char *)p = CHAR_NUMBER; > break; > case 2: > *(short *)p = SHORT_NUMBER; > @@ -830,7 +830,7 @@ static __init void store_return(struct ftrace_graph_ret *trace, > > switch (fixture->store_size) { > case 1: > - expect = BYTE_NUMBER; > + expect = CHAR_NUMBER; > found = *(char *)p; > break; > case 2: > -- > 2.43.0 > >
diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c index 369efc569238..adf0f436d84b 100644 --- a/kernel/trace/trace_selftest.c +++ b/kernel/trace/trace_selftest.c @@ -758,7 +758,7 @@ trace_selftest_startup_function(struct tracer *trace, struct trace_array *tr) #ifdef CONFIG_DYNAMIC_FTRACE -#define BYTE_NUMBER 123 +#define CHAR_NUMBER 123 #define SHORT_NUMBER 12345 #define WORD_NUMBER 1234567890 #define LONG_NUMBER 1234567890123456789LL @@ -789,7 +789,7 @@ static __init int store_entry(struct ftrace_graph_ent *trace, switch (size) { case 1: - *(char *)p = BYTE_NUMBER; + *(char *)p = CHAR_NUMBER; break; case 2: *(short *)p = SHORT_NUMBER; @@ -830,7 +830,7 @@ static __init void store_return(struct ftrace_graph_ret *trace, switch (fixture->store_size) { case 1: - expect = BYTE_NUMBER; + expect = CHAR_NUMBER; found = *(char *)p; break; case 2: