Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0429149fb5e01edc410648591c19095d2074ee00

Authored by Steven Rostedt
Committed by Ingo Molnar
1 parent 2bcd521a68
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

trace: fix compiler warning in branch profiler 

Impact: fix compiler warning

The ftrace_pointers used in the branch profiler are constant values.
They should never change. But the compiler complains when they are
passed into the debugfs_create_file as a data pointer, because the
function discards the qualifier.

This patch typecasts the parameter to debugfs_create_file back to
a void pointer. To remind the callbacks that they are pointing to
a constant value, I also modified the callback local pointers to
be const struct ftrace_pointer * as well.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Showing 1 changed file with 5 additions and 5 deletions Side-by-side Diff

kernel/trace/trace_branch.c
Diff comments   View file @ 0429149
... ... @@ -191,7 +191,7 @@
191 191 static void *
192 192 t_next(struct seq_file *m, void *v, loff_t *pos)
193 193 {
194   - struct ftrace_pointer *f = m->private;
  194 + const struct ftrace_pointer *f = m->private;
195 195 struct ftrace_branch_data *p = v;
196 196  
197 197 (*pos)++;
... ... @@ -224,7 +224,7 @@
224 224  
225 225 static int t_show(struct seq_file *m, void *v)
226 226 {
227   - struct ftrace_pointer *fp = m->private;
  227 + const struct ftrace_pointer *fp = m->private;
228 228 struct ftrace_branch_data *p = v;
229 229 const char *f;
230 230 long percent;
... ... @@ -296,7 +296,7 @@
296 296 extern unsigned long __start_branch_profile[];
297 297 extern unsigned long __stop_branch_profile[];
298 298  
299   -static struct ftrace_pointer ftrace_branch_pos = {
  299 +static const struct ftrace_pointer ftrace_branch_pos = {
300 300 .start = __start_branch_profile,
301 301 .stop = __stop_branch_profile,
302 302 .hit = 1,
... ... @@ -320,7 +320,7 @@
320 320 d_tracer = tracing_init_dentry();
321 321  
322 322 entry = debugfs_create_file("profile_annotated_branch", 0444, d_tracer,
323   - &ftrace_annotated_branch_pos,
  323 + (void *)&ftrace_annotated_branch_pos,
324 324 &tracing_branch_fops);
325 325 if (!entry)
326 326 pr_warning("Could not create debugfs "
... ... @@ -328,7 +328,7 @@
328 328  
329 329 #ifdef CONFIG_PROFILE_ALL_BRANCHES
330 330 entry = debugfs_create_file("profile_branch", 0444, d_tracer,
331   - &ftrace_branch_pos,
  331 + (void *)&ftrace_branch_pos,
332 332 &tracing_branch_fops);
333 333 if (!entry)
334 334 pr_warning("Could not create debugfs"