X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=kernel%2Fperf_event.c;h=af150bbcfc5b63ded3322cb22a949a74a1bcd7d7;hb=3dbebf15c5d3e265f751eec72c1538a00da4be27;hp=e66f6c400d131c5d2fe72b56f5f501467a988a96;hpb=f6f83785222b0ee037f7be90731f62a649292b5e;p=linux-beck.git diff --git a/kernel/perf_event.c b/kernel/perf_event.c index e66f6c400d13..af150bbcfc5b 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -1061,8 +1061,6 @@ static int context_equiv(struct perf_event_context *ctx1, && !ctx1->pin_count && !ctx2->pin_count; } -static void __perf_event_read(void *event); - static void __perf_event_sync_stat(struct perf_event *event, struct perf_event *next_event) { @@ -1080,8 +1078,8 @@ static void __perf_event_sync_stat(struct perf_event *event, */ switch (event->state) { case PERF_EVENT_STATE_ACTIVE: - __perf_event_read(event); - break; + event->pmu->read(event); + /* fall-through */ case PERF_EVENT_STATE_INACTIVE: update_event_times(event);