projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tracing: Make tracing_enabled be equal to tracing_on
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
trace
/
trace_selftest.c
diff --git
a/kernel/trace/trace_selftest.c
b/kernel/trace/trace_selftest.c
index 2c00a691a54068ec9db750f2be4053701bd5be65..091b815f7b0a02de8712521923e63fd8195df09a 100644
(file)
--- a/
kernel/trace/trace_selftest.c
+++ b/
kernel/trace/trace_selftest.c
@@
-320,7
+320,6
@@
int trace_selftest_startup_dynamic_tracing(struct tracer *trace,
int (*func)(void))
{
int save_ftrace_enabled = ftrace_enabled;
int (*func)(void))
{
int save_ftrace_enabled = ftrace_enabled;
- int save_tracer_enabled = tracer_enabled;
unsigned long count;
char *func_name;
int ret;
unsigned long count;
char *func_name;
int ret;
@@
-331,7
+330,6
@@
int trace_selftest_startup_dynamic_tracing(struct tracer *trace,
/* enable tracing, and record the filter function */
ftrace_enabled = 1;
/* enable tracing, and record the filter function */
ftrace_enabled = 1;
- tracer_enabled = 1;
/* passed in by parameter to fool gcc from optimizing */
func();
/* passed in by parameter to fool gcc from optimizing */
func();
@@
-395,7
+393,6
@@
int trace_selftest_startup_dynamic_tracing(struct tracer *trace,
out:
ftrace_enabled = save_ftrace_enabled;
out:
ftrace_enabled = save_ftrace_enabled;
- tracer_enabled = save_tracer_enabled;
/* Enable tracing on all functions again */
ftrace_set_global_filter(NULL, 0, 1);
/* Enable tracing on all functions again */
ftrace_set_global_filter(NULL, 0, 1);
@@
-452,7
+449,6
@@
static int
trace_selftest_function_recursion(void)
{
int save_ftrace_enabled = ftrace_enabled;
trace_selftest_function_recursion(void)
{
int save_ftrace_enabled = ftrace_enabled;
- int save_tracer_enabled = tracer_enabled;
char *func_name;
int len;
int ret;
char *func_name;
int len;
int ret;
@@
-465,7
+461,6
@@
trace_selftest_function_recursion(void)
/* enable tracing, and record the filter function */
ftrace_enabled = 1;
/* enable tracing, and record the filter function */
ftrace_enabled = 1;
- tracer_enabled = 1;
/* Handle PPC64 '.' name */
func_name = "*" __stringify(DYN_FTRACE_TEST_NAME);
/* Handle PPC64 '.' name */
func_name = "*" __stringify(DYN_FTRACE_TEST_NAME);
@@
-534,7
+529,6
@@
trace_selftest_function_recursion(void)
ret = 0;
out:
ftrace_enabled = save_ftrace_enabled;
ret = 0;
out:
ftrace_enabled = save_ftrace_enabled;
- tracer_enabled = save_tracer_enabled;
return ret;
}
return ret;
}
@@
-569,7
+563,6
@@
static int
trace_selftest_function_regs(void)
{
int save_ftrace_enabled = ftrace_enabled;
trace_selftest_function_regs(void)
{
int save_ftrace_enabled = ftrace_enabled;
- int save_tracer_enabled = tracer_enabled;
char *func_name;
int len;
int ret;
char *func_name;
int len;
int ret;
@@
-586,7
+579,6
@@
trace_selftest_function_regs(void)
/* enable tracing, and record the filter function */
ftrace_enabled = 1;
/* enable tracing, and record the filter function */
ftrace_enabled = 1;
- tracer_enabled = 1;
/* Handle PPC64 '.' name */
func_name = "*" __stringify(DYN_FTRACE_TEST_NAME);
/* Handle PPC64 '.' name */
func_name = "*" __stringify(DYN_FTRACE_TEST_NAME);
@@
-648,7
+640,6
@@
trace_selftest_function_regs(void)
ret = 0;
out:
ftrace_enabled = save_ftrace_enabled;
ret = 0;
out:
ftrace_enabled = save_ftrace_enabled;
- tracer_enabled = save_tracer_enabled;
return ret;
}
return ret;
}
@@
-662,7
+653,6
@@
int
trace_selftest_startup_function(struct tracer *trace, struct trace_array *tr)
{
int save_ftrace_enabled = ftrace_enabled;
trace_selftest_startup_function(struct tracer *trace, struct trace_array *tr)
{
int save_ftrace_enabled = ftrace_enabled;
- int save_tracer_enabled = tracer_enabled;
unsigned long count;
int ret;
unsigned long count;
int ret;
@@
-671,7
+661,6
@@
trace_selftest_startup_function(struct tracer *trace, struct trace_array *tr)
/* start the tracing */
ftrace_enabled = 1;
/* start the tracing */
ftrace_enabled = 1;
- tracer_enabled = 1;
ret = tracer_init(trace, tr);
if (ret) {
ret = tracer_init(trace, tr);
if (ret) {
@@
-708,7
+697,6
@@
trace_selftest_startup_function(struct tracer *trace, struct trace_array *tr)
ret = trace_selftest_function_regs();
out:
ftrace_enabled = save_ftrace_enabled;
ret = trace_selftest_function_regs();
out:
ftrace_enabled = save_ftrace_enabled;
- tracer_enabled = save_tracer_enabled;
/* kill ftrace totally if we failed */
if (ret)
/* kill ftrace totally if we failed */
if (ret)