浏览代码

sparc: perf: Remove redundant perf_pmu_{en|dis}able calls

perf_pmu_disable is called by core perf code before pmu->del and the
enable function is called by core perf code afterwards. No need to
call again within sparc_pmu_del.

Ditto for pmu->add and sparc_pmu_add.

Signed-off-by: David Ahern <david.ahern@oracle.com>
Acked-by: Bob Picco <bob.picco@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
David Ahern 10 年之前
父节点
当前提交
5b0d4b5514
共有 1 个文件被更改,包括 0 次插入4 次删除
  1. 0 4
      arch/sparc/kernel/perf_event.c

+ 0 - 4
arch/sparc/kernel/perf_event.c

@@ -1101,7 +1101,6 @@ static void sparc_pmu_del(struct perf_event *event, int _flags)
 	int i;
 	int i;
 
 
 	local_irq_save(flags);
 	local_irq_save(flags);
-	perf_pmu_disable(event->pmu);
 
 
 	for (i = 0; i < cpuc->n_events; i++) {
 	for (i = 0; i < cpuc->n_events; i++) {
 		if (event == cpuc->event[i]) {
 		if (event == cpuc->event[i]) {
@@ -1127,7 +1126,6 @@ static void sparc_pmu_del(struct perf_event *event, int _flags)
 		}
 		}
 	}
 	}
 
 
-	perf_pmu_enable(event->pmu);
 	local_irq_restore(flags);
 	local_irq_restore(flags);
 }
 }
 
 
@@ -1361,7 +1359,6 @@ static int sparc_pmu_add(struct perf_event *event, int ef_flags)
 	unsigned long flags;
 	unsigned long flags;
 
 
 	local_irq_save(flags);
 	local_irq_save(flags);
-	perf_pmu_disable(event->pmu);
 
 
 	n0 = cpuc->n_events;
 	n0 = cpuc->n_events;
 	if (n0 >= sparc_pmu->max_hw_events)
 	if (n0 >= sparc_pmu->max_hw_events)
@@ -1394,7 +1391,6 @@ nocheck:
 
 
 	ret = 0;
 	ret = 0;
 out:
 out:
-	perf_pmu_enable(event->pmu);
 	local_irq_restore(flags);
 	local_irq_restore(flags);
 	return ret;
 	return ret;
 }
 }