diff options
Diffstat (limited to 'kernel/trace/trace_selftest.c')
| -rw-r--r-- | kernel/trace/trace_selftest.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c index 2c00a691a540..091b815f7b0a 100644 --- 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, | |||
| 320 | int (*func)(void)) | 320 | int (*func)(void)) |
| 321 | { | 321 | { |
| 322 | int save_ftrace_enabled = ftrace_enabled; | 322 | int save_ftrace_enabled = ftrace_enabled; |
| 323 | int save_tracer_enabled = tracer_enabled; | ||
| 324 | unsigned long count; | 323 | unsigned long count; |
| 325 | char *func_name; | 324 | char *func_name; |
| 326 | int ret; | 325 | int ret; |
| @@ -331,7 +330,6 @@ int trace_selftest_startup_dynamic_tracing(struct tracer *trace, | |||
| 331 | 330 | ||
| 332 | /* enable tracing, and record the filter function */ | 331 | /* enable tracing, and record the filter function */ |
| 333 | ftrace_enabled = 1; | 332 | ftrace_enabled = 1; |
| 334 | tracer_enabled = 1; | ||
| 335 | 333 | ||
| 336 | /* passed in by parameter to fool gcc from optimizing */ | 334 | /* passed in by parameter to fool gcc from optimizing */ |
| 337 | func(); | 335 | func(); |
| @@ -395,7 +393,6 @@ int trace_selftest_startup_dynamic_tracing(struct tracer *trace, | |||
| 395 | 393 | ||
| 396 | out: | 394 | out: |
| 397 | ftrace_enabled = save_ftrace_enabled; | 395 | ftrace_enabled = save_ftrace_enabled; |
| 398 | tracer_enabled = save_tracer_enabled; | ||
| 399 | 396 | ||
| 400 | /* Enable tracing on all functions again */ | 397 | /* Enable tracing on all functions again */ |
| 401 | ftrace_set_global_filter(NULL, 0, 1); | 398 | ftrace_set_global_filter(NULL, 0, 1); |
| @@ -452,7 +449,6 @@ static int | |||
| 452 | trace_selftest_function_recursion(void) | 449 | trace_selftest_function_recursion(void) |
| 453 | { | 450 | { |
| 454 | int save_ftrace_enabled = ftrace_enabled; | 451 | int save_ftrace_enabled = ftrace_enabled; |
| 455 | int save_tracer_enabled = tracer_enabled; | ||
| 456 | char *func_name; | 452 | char *func_name; |
| 457 | int len; | 453 | int len; |
| 458 | int ret; | 454 | int ret; |
| @@ -465,7 +461,6 @@ trace_selftest_function_recursion(void) | |||
| 465 | 461 | ||
| 466 | /* enable tracing, and record the filter function */ | 462 | /* enable tracing, and record the filter function */ |
| 467 | ftrace_enabled = 1; | 463 | ftrace_enabled = 1; |
| 468 | tracer_enabled = 1; | ||
| 469 | 464 | ||
| 470 | /* Handle PPC64 '.' name */ | 465 | /* Handle PPC64 '.' name */ |
| 471 | func_name = "*" __stringify(DYN_FTRACE_TEST_NAME); | 466 | func_name = "*" __stringify(DYN_FTRACE_TEST_NAME); |
| @@ -534,7 +529,6 @@ trace_selftest_function_recursion(void) | |||
| 534 | ret = 0; | 529 | ret = 0; |
| 535 | out: | 530 | out: |
| 536 | ftrace_enabled = save_ftrace_enabled; | 531 | ftrace_enabled = save_ftrace_enabled; |
| 537 | tracer_enabled = save_tracer_enabled; | ||
| 538 | 532 | ||
| 539 | return ret; | 533 | return ret; |
| 540 | } | 534 | } |
| @@ -569,7 +563,6 @@ static int | |||
| 569 | trace_selftest_function_regs(void) | 563 | trace_selftest_function_regs(void) |
| 570 | { | 564 | { |
| 571 | int save_ftrace_enabled = ftrace_enabled; | 565 | int save_ftrace_enabled = ftrace_enabled; |
| 572 | int save_tracer_enabled = tracer_enabled; | ||
| 573 | char *func_name; | 566 | char *func_name; |
| 574 | int len; | 567 | int len; |
| 575 | int ret; | 568 | int ret; |
| @@ -586,7 +579,6 @@ trace_selftest_function_regs(void) | |||
| 586 | 579 | ||
| 587 | /* enable tracing, and record the filter function */ | 580 | /* enable tracing, and record the filter function */ |
| 588 | ftrace_enabled = 1; | 581 | ftrace_enabled = 1; |
| 589 | tracer_enabled = 1; | ||
| 590 | 582 | ||
| 591 | /* Handle PPC64 '.' name */ | 583 | /* Handle PPC64 '.' name */ |
| 592 | func_name = "*" __stringify(DYN_FTRACE_TEST_NAME); | 584 | func_name = "*" __stringify(DYN_FTRACE_TEST_NAME); |
| @@ -648,7 +640,6 @@ trace_selftest_function_regs(void) | |||
| 648 | ret = 0; | 640 | ret = 0; |
| 649 | out: | 641 | out: |
| 650 | ftrace_enabled = save_ftrace_enabled; | 642 | ftrace_enabled = save_ftrace_enabled; |
| 651 | tracer_enabled = save_tracer_enabled; | ||
| 652 | 643 | ||
| 653 | return ret; | 644 | return ret; |
| 654 | } | 645 | } |
| @@ -662,7 +653,6 @@ int | |||
| 662 | trace_selftest_startup_function(struct tracer *trace, struct trace_array *tr) | 653 | trace_selftest_startup_function(struct tracer *trace, struct trace_array *tr) |
| 663 | { | 654 | { |
| 664 | int save_ftrace_enabled = ftrace_enabled; | 655 | int save_ftrace_enabled = ftrace_enabled; |
| 665 | int save_tracer_enabled = tracer_enabled; | ||
| 666 | unsigned long count; | 656 | unsigned long count; |
| 667 | int ret; | 657 | int ret; |
| 668 | 658 | ||
| @@ -671,7 +661,6 @@ trace_selftest_startup_function(struct tracer *trace, struct trace_array *tr) | |||
| 671 | 661 | ||
| 672 | /* start the tracing */ | 662 | /* start the tracing */ |
| 673 | ftrace_enabled = 1; | 663 | ftrace_enabled = 1; |
| 674 | tracer_enabled = 1; | ||
| 675 | 664 | ||
| 676 | ret = tracer_init(trace, tr); | 665 | ret = tracer_init(trace, tr); |
| 677 | if (ret) { | 666 | if (ret) { |
| @@ -708,7 +697,6 @@ trace_selftest_startup_function(struct tracer *trace, struct trace_array *tr) | |||
| 708 | ret = trace_selftest_function_regs(); | 697 | ret = trace_selftest_function_regs(); |
| 709 | out: | 698 | out: |
| 710 | ftrace_enabled = save_ftrace_enabled; | 699 | ftrace_enabled = save_ftrace_enabled; |
| 711 | tracer_enabled = save_tracer_enabled; | ||
| 712 | 700 | ||
| 713 | /* kill ftrace totally if we failed */ | 701 | /* kill ftrace totally if we failed */ |
| 714 | if (ret) | 702 | if (ret) |
