Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 3a36cb11ca65cd6804972eaf1000378ba4384ea7

Authored by Jiri Slaby
Committed by Steven Rostedt
1 parent af64a7cb09
Exists in master and in 13 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.15.y, ti-lsk-linux-4.1.y

ftrace: Do not pass data to ftrace_dyn_arch_init 

As the data parameter is not really used by any ftrace_dyn_arch_init,
remove that from ftrace_dyn_arch_init. This also removes the addr
local variable from ftrace_init which is now unused.

Note the documentation was imprecise as it did not suggest to set
(*data) to 0.

Link: http://lkml.kernel.org/r/1393268401-24379-4-git-send-email-jslaby@suse.cz

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: linux-arch@vger.kernel.org
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

Showing 15 changed files with 16 additions and 19 deletions Side-by-side Diff

Documentation/trace/ftrace-design.txt
Diff comments   View file @ 3a36cb1
... ... @@ -358,7 +358,7 @@
358 358 to initialize some state, this is the time to do that. Otherwise, this simple
359 359 function below should be sufficient for most people:
360 360  
361   -int __init ftrace_dyn_arch_init(void *data)
  361 +int __init ftrace_dyn_arch_init(void)
362 362 {
363 363 return 0;
364 364 }
arch/arm/kernel/ftrace.c
Diff comments   View file @ 3a36cb1
... ... @@ -156,7 +156,7 @@
156 156 return ret;
157 157 }
158 158  
159   -int __init ftrace_dyn_arch_init(void *data)
  159 +int __init ftrace_dyn_arch_init(void)
160 160 {
161 161 return 0;
162 162 }
arch/blackfin/kernel/ftrace.c
Diff comments   View file @ 3a36cb1
... ... @@ -65,7 +65,7 @@
65 65 return ftrace_modify_code(ip, call, sizeof(call));
66 66 }
67 67  
68   -int __init ftrace_dyn_arch_init(void *data)
  68 +int __init ftrace_dyn_arch_init(void)
69 69 {
70 70 return 0;
71 71 }
arch/ia64/kernel/ftrace.c
Diff comments   View file @ 3a36cb1
... ... @@ -198,7 +198,7 @@
198 198 }
199 199  
200 200 /* run from kstop_machine */
201   -int __init ftrace_dyn_arch_init(void *data)
  201 +int __init ftrace_dyn_arch_init(void)
202 202 {
203 203 return 0;
204 204 }
arch/metag/kernel/ftrace.c
Diff comments   View file @ 3a36cb1
... ... @@ -117,7 +117,7 @@
117 117 }
118 118  
119 119 /* run from kstop_machine */
120   -int __init ftrace_dyn_arch_init(void *data)
  120 +int __init ftrace_dyn_arch_init(void)
121 121 {
122 122 return 0;
123 123 }
arch/microblaze/kernel/ftrace.c
Diff comments   View file @ 3a36cb1
... ... @@ -171,7 +171,7 @@
171 171 return ret;
172 172 }
173 173  
174   -int __init ftrace_dyn_arch_init(void *data)
  174 +int __init ftrace_dyn_arch_init(void)
175 175 {
176 176 return 0;
177 177 }
arch/mips/kernel/ftrace.c
Diff comments   View file @ 3a36cb1
... ... @@ -198,7 +198,7 @@
198 198 return ftrace_modify_code(FTRACE_CALL_IP, new);
199 199 }
200 200  
201   -int __init ftrace_dyn_arch_init(void *data)
  201 +int __init ftrace_dyn_arch_init(void)
202 202 {
203 203 /* Encode the instructions when booting */
204 204 ftrace_dyn_arch_init_insns();
arch/powerpc/kernel/ftrace.c
Diff comments   View file @ 3a36cb1
... ... @@ -531,7 +531,7 @@
531 531 ftrace_disable_ftrace_graph_caller();
532 532 }
533 533  
534   -int __init ftrace_dyn_arch_init(void *data)
  534 +int __init ftrace_dyn_arch_init(void)
535 535 {
536 536 return 0;
537 537 }
arch/s390/kernel/ftrace.c
Diff comments   View file @ 3a36cb1
... ... @@ -130,7 +130,7 @@
130 130 return 0;
131 131 }
132 132  
133   -int __init ftrace_dyn_arch_init(void *data)
  133 +int __init ftrace_dyn_arch_init(void)
134 134 {
135 135 return 0;
136 136 }
arch/sh/kernel/ftrace.c
Diff comments   View file @ 3a36cb1
... ... @@ -272,7 +272,7 @@
272 272 return ftrace_modify_code(rec->ip, old, new);
273 273 }
274 274  
275   -int __init ftrace_dyn_arch_init(void *data)
  275 +int __init ftrace_dyn_arch_init(void)
276 276 {
277 277 return 0;
278 278 }
arch/sparc/kernel/ftrace.c
Diff comments   View file @ 3a36cb1
... ... @@ -82,7 +82,7 @@
82 82 return ftrace_modify_code(ip, old, new);
83 83 }
84 84  
85   -int __init ftrace_dyn_arch_init(void *data)
  85 +int __init ftrace_dyn_arch_init(void)
86 86 {
87 87 return 0;
88 88 }
arch/tile/kernel/ftrace.c
Diff comments   View file @ 3a36cb1
... ... @@ -167,7 +167,7 @@
167 167 return ret;
168 168 }
169 169  
170   -int __init ftrace_dyn_arch_init(void *data)
  170 +int __init ftrace_dyn_arch_init(void)
171 171 {
172 172 return 0;
173 173 }
arch/x86/kernel/ftrace.c
Diff comments   View file @ 3a36cb1
... ... @@ -668,7 +668,7 @@
668 668 atomic_dec(&modifying_ftrace_code);
669 669 }
670 670  
671   -int __init ftrace_dyn_arch_init(void *data)
  671 +int __init ftrace_dyn_arch_init(void)
672 672 {
673 673 return 0;
674 674 }
include/linux/ftrace.h
Diff comments   View file @ 3a36cb1
... ... @@ -423,7 +423,7 @@
423 423  
424 424 /* defined in arch */
425 425 extern int ftrace_ip_converted(unsigned long ip);
426   -extern int ftrace_dyn_arch_init(void *data);
  426 +extern int ftrace_dyn_arch_init(void);
427 427 extern void ftrace_replace_code(int enable);
428 428 extern int ftrace_update_ftrace_func(ftrace_func_t func);
429 429 extern void ftrace_caller(void);
kernel/trace/ftrace.c
Diff comments   View file @ 3a36cb1
... ... @@ -4372,14 +4372,11 @@
4372 4372 {
4373 4373 extern unsigned long __start_mcount_loc[];
4374 4374 extern unsigned long __stop_mcount_loc[];
4375   - unsigned long count, addr, flags;
  4375 + unsigned long count, flags;
4376 4376 int ret;
4377 4377  
4378   - /* Keep the ftrace pointer to the stub */
4379   - addr = (unsigned long)ftrace_stub;
4380   -
4381 4378 local_irq_save(flags);
4382   - ret = ftrace_dyn_arch_init(&addr);
  4379 + ret = ftrace_dyn_arch_init();
4383 4380 local_irq_restore(flags);
4384 4381 if (ret)
4385 4382 goto failed;