diff --git a/[refs] b/[refs] index ff355a5ad81d..81d3f30aa103 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6bb56347f5162d1a7cb1dc461023360781ecd4c0 +refs/heads/master: eced1dfcfcf6b0a35e925d73916a9d8e36ab5457 diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c index 7d4bb83b78cf..d7cbc579fc80 100644 --- a/trunk/kernel/perf_counter.c +++ b/trunk/kernel/perf_counter.c @@ -4066,6 +4066,7 @@ perf_counter_alloc(struct perf_counter_attr *attr, hwc->sample_period = attr->sample_period; if (attr->freq && attr->sample_freq) hwc->sample_period = 1; + hwc->last_period = hwc->sample_period; atomic64_set(&hwc->period_left, hwc->sample_period);