diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c index 1da80ec37fea0cdcbb7cb9f9615f6fe510c4691a..f962cef2e9237f20436ab2324d6655787aeb5e08 100644 --- a/arch/arm/kernel/perf_event.c +++ b/arch/arm/kernel/perf_event.c @@ -574,7 +574,7 @@ static void armpmu_init(struct arm_pmu *armpmu) armpmu->pmu.start = armpmu_start; armpmu->pmu.stop = armpmu_stop; armpmu->pmu.read = armpmu_read; - armpmu->pmu.events_across_hotplug = 1; + armpmu->pmu.events_across_hotplug = 0; } int armpmu_register(struct arm_pmu *armpmu, int type) diff --git a/arch/arm/kernel/perf_event_cpu.c b/arch/arm/kernel/perf_event_cpu.c index 88ffb8007e66ce70106793f238a5fb20ae17eb62..bf6be9eca71ee22455d19530f2f0c13444a994a8 100644 --- a/arch/arm/kernel/perf_event_cpu.c +++ b/arch/arm/kernel/perf_event_cpu.c @@ -313,7 +313,7 @@ static int perf_cpu_pm_notifier(struct notifier_block *self, unsigned long cmd, * to re-enable active counters. */ __get_cpu_var(from_idle) = 1; - cpu_pmu->reset(NULL); + cpu_pmu->reset(cpu_pmu); pmu = &cpu_pmu->pmu; pmu->pmu_enable(pmu); } diff --git a/kernel/events/core.c b/kernel/events/core.c index 9f9a123247fde32cfb1d4191fbea7b3c9452b33c..8794516d199c974c4665e121e44835d8c58f5657 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -5519,7 +5519,7 @@ static struct pmu perf_swevent = { .read = perf_swevent_read, .event_idx = perf_swevent_event_idx, - .events_across_hotplug = 1, + .events_across_hotplug = 0, }; #ifdef CONFIG_EVENT_TRACING @@ -5639,7 +5639,7 @@ static struct pmu perf_tracepoint = { .read = perf_swevent_read, .event_idx = perf_swevent_event_idx, - .events_across_hotplug = 1, + .events_across_hotplug = 0, }; static inline void perf_tp_register(void) @@ -5867,7 +5867,7 @@ static struct pmu perf_cpu_clock = { .read = cpu_clock_event_read, .event_idx = perf_swevent_event_idx, - .events_across_hotplug = 1, + .events_across_hotplug = 0, }; /* @@ -5948,7 +5948,7 @@ static struct pmu perf_task_clock = { .read = task_clock_event_read, .event_idx = perf_swevent_event_idx, - .events_across_hotplug = 1, + .events_across_hotplug = 0, }; static void perf_pmu_nop_void(struct pmu *pmu)