aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/perf_event.c
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2010-09-06 09:51:45 -0400
committerIngo Molnar <mingo@elte.hu>2010-09-09 14:46:31 -0400
commit15ac9a395a753cb28c674e7ea80386ffdff21785 (patch)
tree63879e3031a6ed8e372ffd254ef97ff703a4d478 /arch/sparc/kernel/perf_event.c
parenta4eaf7f14675cb512d69f0c928055e73d0c6d252 (diff)
perf: Remove the sysfs bits
Neither the overcommit nor the reservation sysfs parameter were actually working, remove them as they'll only get in the way. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: paulus <paulus@samba.org> LKML-Reference: <new-submission> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sparc/kernel/perf_event.c')
-rw-r--r--arch/sparc/kernel/perf_event.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/sparc/kernel/perf_event.c b/arch/sparc/kernel/perf_event.c
index 516be2314b54..f9a706759364 100644
--- a/arch/sparc/kernel/perf_event.c
+++ b/arch/sparc/kernel/perf_event.c
@@ -897,7 +897,7 @@ static int sparc_check_constraints(struct perf_event **evts,
897 if (!n_ev) 897 if (!n_ev)
898 return 0; 898 return 0;
899 899
900 if (n_ev > perf_max_events) 900 if (n_ev > MAX_HWEVENTS)
901 return -1; 901 return -1;
902 902
903 msk0 = perf_event_get_msk(events[0]); 903 msk0 = perf_event_get_msk(events[0]);
@@ -1014,7 +1014,7 @@ static int sparc_pmu_add(struct perf_event *event, int ef_flags)
1014 perf_pmu_disable(event->pmu); 1014 perf_pmu_disable(event->pmu);
1015 1015
1016 n0 = cpuc->n_events; 1016 n0 = cpuc->n_events;
1017 if (n0 >= perf_max_events) 1017 if (n0 >= MAX_HWEVENTS)
1018 goto out; 1018 goto out;
1019 1019
1020 cpuc->event[n0] = event; 1020 cpuc->event[n0] = event;
@@ -1097,7 +1097,7 @@ static int sparc_pmu_event_init(struct perf_event *event)
1097 n = 0; 1097 n = 0;
1098 if (event->group_leader != event) { 1098 if (event->group_leader != event) {
1099 n = collect_events(event->group_leader, 1099 n = collect_events(event->group_leader,
1100 perf_max_events - 1, 1100 MAX_HWEVENTS - 1,
1101 evts, events, current_idx_dmy); 1101 evts, events, current_idx_dmy);
1102 if (n < 0) 1102 if (n < 0)
1103 return -EINVAL; 1103 return -EINVAL;
@@ -1309,9 +1309,6 @@ void __init init_hw_perf_events(void)
1309 1309
1310 pr_cont("Supported PMU type is '%s'\n", sparc_pmu_type); 1310 pr_cont("Supported PMU type is '%s'\n", sparc_pmu_type);
1311 1311
1312 /* All sparc64 PMUs currently have 2 events. */
1313 perf_max_events = 2;
1314
1315 perf_pmu_register(&pmu); 1312 perf_pmu_register(&pmu);
1316 register_die_notifier(&perf_event_nmi_notifier); 1313 register_die_notifier(&perf_event_nmi_notifier);
1317} 1314}