aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/perf_counter.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/perf_counter.c')
-rw-r--r--kernel/perf_counter.c22
1 files changed, 9 insertions, 13 deletions
diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index 1773c5d7427d..68950a3a52bf 100644
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
@@ -1503,6 +1503,12 @@ static void perf_swcounter_disable(struct perf_counter *counter)
1503 perf_swcounter_update(counter); 1503 perf_swcounter_update(counter);
1504} 1504}
1505 1505
1506static const struct hw_perf_counter_ops perf_ops_generic = {
1507 .enable = perf_swcounter_enable,
1508 .disable = perf_swcounter_disable,
1509 .read = perf_swcounter_read,
1510};
1511
1506/* 1512/*
1507 * Software counter: cpu wall time clock 1513 * Software counter: cpu wall time clock
1508 */ 1514 */
@@ -1604,16 +1610,6 @@ static const struct hw_perf_counter_ops perf_ops_task_clock = {
1604}; 1610};
1605 1611
1606/* 1612/*
1607 * Software counter: page faults
1608 */
1609
1610static const struct hw_perf_counter_ops perf_ops_page_faults = {
1611 .enable = perf_swcounter_enable,
1612 .disable = perf_swcounter_disable,
1613 .read = perf_swcounter_read,
1614};
1615
1616/*
1617 * Software counter: context switches 1613 * Software counter: context switches
1618 */ 1614 */
1619 1615
@@ -1753,9 +1749,9 @@ sw_perf_counter_init(struct perf_counter *counter)
1753 hw_ops = &perf_ops_cpu_clock; 1749 hw_ops = &perf_ops_cpu_clock;
1754 break; 1750 break;
1755 case PERF_COUNT_PAGE_FAULTS: 1751 case PERF_COUNT_PAGE_FAULTS:
1756 if (!(counter->hw_event.exclude_user || 1752 case PERF_COUNT_PAGE_FAULTS_MIN:
1757 counter->hw_event.exclude_kernel)) 1753 case PERF_COUNT_PAGE_FAULTS_MAJ:
1758 hw_ops = &perf_ops_page_faults; 1754 hw_ops = &perf_ops_generic;
1759 break; 1755 break;
1760 case PERF_COUNT_CONTEXT_SWITCHES: 1756 case PERF_COUNT_CONTEXT_SWITCHES:
1761 if (!counter->hw_event.exclude_kernel) 1757 if (!counter->hw_event.exclude_kernel)