diff options
Diffstat (limited to 'arch/x86/kernel/cpu')
-rw-r--r-- | arch/x86/kernel/cpu/perf_event.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index b68c4fb7a944..071c8405debd 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c | |||
@@ -959,7 +959,7 @@ static int x86_pmu_enable(struct perf_event *event) | |||
959 | memcpy(cpuc->assign, assign, n*sizeof(int)); | 959 | memcpy(cpuc->assign, assign, n*sizeof(int)); |
960 | 960 | ||
961 | cpuc->n_events = n; | 961 | cpuc->n_events = n; |
962 | cpuc->n_added = n - n0; | 962 | cpuc->n_added += n - n0; |
963 | 963 | ||
964 | return 0; | 964 | return 0; |
965 | } | 965 | } |
@@ -1302,7 +1302,7 @@ int hw_perf_group_sched_in(struct perf_event *leader, | |||
1302 | memcpy(cpuc->assign, assign, n0*sizeof(int)); | 1302 | memcpy(cpuc->assign, assign, n0*sizeof(int)); |
1303 | 1303 | ||
1304 | cpuc->n_events = n0; | 1304 | cpuc->n_events = n0; |
1305 | cpuc->n_added = n1; | 1305 | cpuc->n_added += n1; |
1306 | ctx->nr_active += n1; | 1306 | ctx->nr_active += n1; |
1307 | 1307 | ||
1308 | /* | 1308 | /* |