Merge "perf/core: Compile out perf_cpu_hp_init when CONFIG_HOTPLUG is not set" into msm-4.9 (4088e848) · Commits · e / devices / android_kernel_fairphone_FP3

kernel/events/core.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -10949,6 +10949,7 @@ static int __init perf_event_sysfs_init(void)
		}
		device_initcall(perf_event_sysfs_init);

		#ifdef CONFIG_HOTPLUG_CPU
		static int perf_cpu_hp_init(void)
		{
		int ret;
		@@ -10963,6 +10964,7 @@ static int perf_cpu_hp_init(void)
		return ret;
		}
		subsys_initcall(perf_cpu_hp_init);
		#endif

		#ifdef CONFIG_CGROUP_PERF
		static struct cgroup_subsys_state *