diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2010-03-25 09:51:50 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-03-26 06:33:55 -0400 |
commit | faa4602e47690fb11221e00f9b9697c8dc0d4b19 (patch) | |
tree | af667d1cdff7dc63b6893ee3f27a1f2503229ed1 /kernel/trace/trace_selftest.c | |
parent | 7c5ecaf7666617889f337296c610815b519abfa9 (diff) |
x86, perf, bts, mm: Delete the never used BTS-ptrace code
Support for the PMU's BTS features has been upstreamed in
v2.6.32, but we still have the old and disabled ptrace-BTS,
as Linus noticed it not so long ago.
It's buggy: TIF_DEBUGCTLMSR is trampling all over that MSR without
regard for other uses (perf) and doesn't provide the flexibility
needed for perf either.
Its users are ptrace-block-step and ptrace-bts, since ptrace-bts
was never used and ptrace-block-step can be implemented using a
much simpler approach.
So axe all 3000 lines of it. That includes the *locked_memory*()
APIs in mm/mlock.c as well.
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Roland McGrath <roland@redhat.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Markus Metzger <markus.t.metzger@intel.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <20100325135413.938004390@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/trace_selftest.c')
-rw-r--r-- | kernel/trace/trace_selftest.c | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c index 280fea470d6..a7084e7c042 100644 --- a/kernel/trace/trace_selftest.c +++ b/kernel/trace/trace_selftest.c | |||
@@ -16,7 +16,6 @@ static inline int trace_valid_entry(struct trace_entry *entry) | |||
16 | case TRACE_BRANCH: | 16 | case TRACE_BRANCH: |
17 | case TRACE_GRAPH_ENT: | 17 | case TRACE_GRAPH_ENT: |
18 | case TRACE_GRAPH_RET: | 18 | case TRACE_GRAPH_RET: |
19 | case TRACE_HW_BRANCHES: | ||
20 | case TRACE_KSYM: | 19 | case TRACE_KSYM: |
21 | return 1; | 20 | return 1; |
22 | } | 21 | } |
@@ -754,62 +753,6 @@ trace_selftest_startup_branch(struct tracer *trace, struct trace_array *tr) | |||
754 | } | 753 | } |
755 | #endif /* CONFIG_BRANCH_TRACER */ | 754 | #endif /* CONFIG_BRANCH_TRACER */ |
756 | 755 | ||
757 | #ifdef CONFIG_HW_BRANCH_TRACER | ||
758 | int | ||
759 | trace_selftest_startup_hw_branches(struct tracer *trace, | ||
760 | struct trace_array *tr) | ||
761 | { | ||
762 | struct trace_iterator *iter; | ||
763 | struct tracer tracer; | ||
764 | unsigned long count; | ||
765 | int ret; | ||
766 | |||
767 | if (!trace->open) { | ||
768 | printk(KERN_CONT "missing open function..."); | ||
769 | return -1; | ||
770 | } | ||
771 | |||
772 | ret = tracer_init(trace, tr); | ||
773 | if (ret) { | ||
774 | warn_failed_init_tracer(trace, ret); | ||
775 | return ret; | ||
776 | } | ||
777 | |||
778 | /* | ||
779 | * The hw-branch tracer needs to collect the trace from the various | ||
780 | * cpu trace buffers - before tracing is stopped. | ||
781 | */ | ||
782 | iter = kzalloc(sizeof(*iter), GFP_KERNEL); | ||
783 | if (!iter) | ||
784 | return -ENOMEM; | ||
785 | |||
786 | memcpy(&tracer, trace, sizeof(tracer)); | ||
787 | |||
788 | iter->trace = &tracer; | ||
789 | iter->tr = tr; | ||
790 | iter->pos = -1; | ||
791 | mutex_init(&iter->mutex); | ||
792 | |||
793 | trace->open(iter); | ||
794 | |||
795 | mutex_destroy(&iter->mutex); | ||
796 | kfree(iter); | ||
797 | |||
798 | tracing_stop(); | ||
799 | |||
800 | ret = trace_test_buffer(tr, &count); | ||
801 | trace->reset(tr); | ||
802 | tracing_start(); | ||
803 | |||
804 | if (!ret && !count) { | ||
805 | printk(KERN_CONT "no entries found.."); | ||
806 | ret = -1; | ||
807 | } | ||
808 | |||
809 | return ret; | ||
810 | } | ||
811 | #endif /* CONFIG_HW_BRANCH_TRACER */ | ||
812 | |||
813 | #ifdef CONFIG_KSYM_TRACER | 756 | #ifdef CONFIG_KSYM_TRACER |
814 | static int ksym_selftest_dummy; | 757 | static int ksym_selftest_dummy; |
815 | 758 | ||