2 files changed, 6 insertions, 8 deletions

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index bf85733597ec..8cafa15af60d 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -529,7 +529,6 @@ struct hw_perf_event {
                         int             last_cpu;
                 };
                 struct { /* software */
-                        s64             remaining;
                         struct hrtimer  hrtimer;
                 };
 #ifdef CONFIG_HAVE_HW_BREAKPOINT
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 8ef4ba3bcb1f..1a6cdbf0d091 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -4800,14 +4800,13 @@ static void perf_swevent_start_hrtimer(struct perf_event *event)
         hrtimer_init(&hwc->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
         hwc->hrtimer.function = perf_swevent_hrtimer;
         if (hwc->sample_period) {
-                u64 period;
+                s64 period = local64_read(&hwc->period_left);
 
-                if (hwc->remaining) {
-                        if (hwc->remaining < 0)
+                if (period) {
+                        if (period < 0)
                                 period = 10000;
-                        else
-                                period = hwc->remaining;
-                        hwc->remaining = 0;
+
+                        local64_set(&hwc->period_left, 0);
                 } else {
                         period = max_t(u64, 10000, hwc->sample_period);
                 }
@@ -4823,7 +4822,7 @@ static void perf_swevent_cancel_hrtimer(struct perf_event *event)
 
         if (hwc->sample_period) {
                 ktime_t remaining = hrtimer_get_remaining(&hwc->hrtimer);
-                hwc->remaining = ktime_to_ns(remaining);
+                local64_set(&hwc->period_left, ktime_to_ns(remaining));
 
                 hrtimer_cancel(&hwc->hrtimer);
         }