perf/x86: Remove P6 cpuc->enabled check
authorVince Weaver <vincent.weaver@maine.edu>
Fri, 19 Oct 2012 21:33:38 +0000 (17:33 -0400)
committerIngo Molnar <mingo@kernel.org>
Wed, 24 Oct 2012 08:32:00 +0000 (10:32 +0200)
commit58e9eaf06f5476cb2192ec1d012674ce5e79dd21
tree9e5d64ad3aa856c29b39c941bae67490e89b87dd
parente09df47885d767e418902067ce1885aafa3b27db
perf/x86: Remove P6 cpuc->enabled check

Between 2.6.33 and 2.6.34 the PMU code was made modular.

The x86_pmu_enable() call was extended to disable cpuc->enabled
and iterate the counters, enabling one at a time, before calling
enable_all() at the end, followed by re-enabling cpuc->enabled.

Since cpuc->enabled was set to 0, that change effectively caused
the "val |= ARCH_PERFMON_EVENTSEL_ENABLE;" code in p6_pmu_enable_event()
and p6_pmu_disable_event() to be dead code that was never called.

This change removes this code (which was confusing) and adds some
extra commentary to make it more clear what is going on.

Signed-off-by: Vince Weaver <vincent.weaver@maine.edu>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/alpine.DEB.2.02.1210191732000.14552@vincent-weaver-1.um.maine.edu
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/cpu/perf_event_p6.c