diff --git a/[refs] b/[refs] index fdcd32a619a2..92ea0315ac26 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3424dabb6508d538e9ec1a2aa889fefbd83df2d0 +refs/heads/master: c43ca04b5e7854b3996f84a495e4553941e76266 diff --git a/trunk/arch/metag/kernel/perf/perf_event.c b/trunk/arch/metag/kernel/perf/perf_event.c index f38bf6d4dc55..8096db2a550b 100644 --- a/trunk/arch/metag/kernel/perf/perf_event.c +++ b/trunk/arch/metag/kernel/perf/perf_event.c @@ -211,7 +211,7 @@ void metag_pmu_event_update(struct perf_event *event, /* * Calculate the delta and add it to the counter. */ - delta = new_raw_count - prev_raw_count; + delta = (new_raw_count - prev_raw_count) & MAX_PERIOD; local64_add(delta, &event->count); }