From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 7 Apr 2014 21:55:46 +0000 (-0700)
Subject: Merge tag 'cpu-hotplug-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=467a9e1633043810259a7f5368fbcc1e84746137;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'cpu-hotplug-3.15-rc1' of git://git./linux/kernel/git/rafael/linux-pm

Pull CPU hotplug notifiers registration fixes from Rafael Wysocki:
 "The purpose of this single series of commits from Srivatsa S Bhat
  (with a small piece from Gautham R Shenoy) touching multiple
  subsystems that use CPU hotplug notifiers is to provide a way to
  register them that will not lead to deadlocks with CPU online/offline
  operations as described in the changelog of commit 93ae4f978ca7f ("CPU
  hotplug: Provide lockless versions of callback registration
  functions").

  The first three commits in the series introduce the API and document
  it and the rest simply goes through the users of CPU hotplug notifiers
  and converts them to using the new method"

* tag 'cpu-hotplug-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (52 commits)
  net/iucv/iucv.c: Fix CPU hotplug callback registration
  net/core/flow.c: Fix CPU hotplug callback registration
  mm, zswap: Fix CPU hotplug callback registration
  mm, vmstat: Fix CPU hotplug callback registration
  profile: Fix CPU hotplug callback registration
  trace, ring-buffer: Fix CPU hotplug callback registration
  xen, balloon: Fix CPU hotplug callback registration
  hwmon, via-cputemp: Fix CPU hotplug callback registration
  hwmon, coretemp: Fix CPU hotplug callback registration
  thermal, x86-pkg-temp: Fix CPU hotplug callback registration
  octeon, watchdog: Fix CPU hotplug callback registration
  oprofile, nmi-timer: Fix CPU hotplug callback registration
  intel-idle: Fix CPU hotplug callback registration
  clocksource, dummy-timer: Fix CPU hotplug callback registration
  drivers/base/topology.c: Fix CPU hotplug callback registration
  acpi-cpufreq: Fix CPU hotplug callback registration
  zsmalloc: Fix CPU hotplug callback registration
  scsi, fcoe: Fix CPU hotplug callback registration
  scsi, bnx2fc: Fix CPU hotplug callback registration
  scsi, bnx2i: Fix CPU hotplug callback registration
  ...
---

467a9e1633043810259a7f5368fbcc1e84746137
diff --cc arch/arm64/kernel/debug-monitors.c
index 14ba23c61153,c9855313eb27..ed3955a95747
--- a/arch/arm64/kernel/debug-monitors.c
+++ b/arch/arm64/kernel/debug-monitors.c
@@@ -154,13 -155,16 +154,17 @@@ static struct notifier_block os_lock_n
  
  static int debug_monitors_init(void)
  {
+ 	cpu_notifier_register_begin();
+ 
  	/* Clear the OS lock. */
 -	smp_call_function(clear_os_lock, NULL, 1);
 -	clear_os_lock(NULL);
 +	on_each_cpu(clear_os_lock, NULL, 1);
 +	isb();
 +	local_dbg_enable();
  
  	/* Register hotplug handler. */
- 	register_cpu_notifier(&os_lock_nb);
+ 	__register_cpu_notifier(&os_lock_nb);
+ 
+ 	cpu_notifier_register_done();
  	return 0;
  }
  postcore_initcall(debug_monitors_init);
diff --cc arch/x86/kernel/cpu/perf_event_intel_uncore.c
index bd2253d40cff,28922f62eb29..65bbbea38b9c
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
@@@ -4234,41 -3868,6 +4234,41 @@@ static int __init uncore_pmus_register(
  	return 0;
  }
  
 +static void __init uncore_cpumask_init(void)
 +{
 +	int cpu;
 +
 +	/*
 +	 * ony invoke once from msr or pci init code
 +	 */
 +	if (!cpumask_empty(&uncore_cpu_mask))
 +		return;
 +
- 	get_online_cpus();
++	cpu_notifier_register_begin();
 +
 +	for_each_online_cpu(cpu) {
 +		int i, phys_id = topology_physical_package_id(cpu);
 +
 +		for_each_cpu(i, &uncore_cpu_mask) {
 +			if (phys_id == topology_physical_package_id(i)) {
 +				phys_id = -1;
 +				break;
 +			}
 +		}
 +		if (phys_id < 0)
 +			continue;
 +
 +		uncore_cpu_prepare(cpu, phys_id);
 +		uncore_event_init_cpu(cpu);
 +	}
 +	on_each_cpu(uncore_cpu_setup, NULL, 1);
 +
- 	register_cpu_notifier(&uncore_cpu_nb);
++	__register_cpu_notifier(&uncore_cpu_nb);
 +
- 	put_online_cpus();
++	cpu_notifier_register_done();
 +}
 +
 +
  static int __init intel_uncore_init(void)
  {
  	int ret;
diff --cc kernel/profile.c
index 1b266dbe755a,93b2a3fe0a64..cb980f0c731b
--- a/kernel/profile.c
+++ b/kernel/profile.c
@@@ -599,10 -606,13 +606,13 @@@ int __ref create_proc_profile(void) /* 
  	entry = proc_create("profile", S_IWUSR | S_IRUGO,
  			    NULL, &proc_profile_operations);
  	if (!entry)
- 		return 0;
+ 		goto out;
  	proc_set_size(entry, (1 + prof_len) * sizeof(atomic_t));
- 	hotcpu_notifier(profile_cpu_callback, 0);
- 	return 0;
+ 	__hotcpu_notifier(profile_cpu_callback, 0);
+ 
+ out:
+ 	cpu_notifier_register_done();
+ 	return err;
  }
 -module_init(create_proc_profile);
 +subsys_initcall(create_proc_profile);
  #endif /* CONFIG_PROC_FS */