3 files changed, 16 insertions, 5 deletions

diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c
index bc3f2efa0d86..789d846a9184 100644
--- a/arch/arm/kernel/perf_event.c
+++ b/arch/arm/kernel/perf_event.c
@@ -99,10 +99,6 @@ int armpmu_event_set_period(struct perf_event *event)
         s64 period = hwc->sample_period;
         int ret = 0;
 
-        /* The period may have been changed by PERF_EVENT_IOC_PERIOD */
-        if (unlikely(period != hwc->last_period))
-                left = period - (hwc->last_period - left);
-
         if (unlikely(left <= -period)) {
                 left = period;
                 local64_set(&hwc->period_left, left);
diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
index bf8e4a736d48..0e3754e450d9 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
@@ -615,6 +615,7 @@ static int __init rapl_pmu_init(void)
         case 42: /* Sandy Bridge */
         case 58: /* Ivy Bridge */
         case 60: /* Haswell */
+        case 69: /* Haswell-Celeron */
                 rapl_cntr_mask = RAPL_IDX_CLN;
                 rapl_pmu_events_group.attrs = rapl_events_cln_attr;
                 break;
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 403b781daafb..89d34f9bb8cb 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -3527,7 +3527,7 @@ static void perf_event_for_each(struct perf_event *event,
 static int perf_event_period(struct perf_event *event, u64 __user *arg)
 {
         struct perf_event_context *ctx = event->ctx;
-        int ret = 0;
+        int ret = 0, active;
         u64 value;
 
         if (!is_sampling_event(event))
@@ -3551,6 +3551,20 @@ static int perf_event_period(struct perf_event *event, u64 __user *arg)
                 event->attr.sample_period = value;
                 event->hw.sample_period = value;
         }
+
+        active = (event->state == PERF_EVENT_STATE_ACTIVE);
+        if (active) {
+                perf_pmu_disable(ctx->pmu);
+                event->pmu->stop(event, PERF_EF_UPDATE);
+        }
+
+        local64_set(&event->hw.period_left, 0);
+
+        if (active) {
+                event->pmu->start(event, PERF_EF_RELOAD);
+                perf_pmu_enable(ctx->pmu);
+        }
+
 unlock:
         raw_spin_unlock_irq(&ctx->lock);