Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Nov 2017 02:23:19 +0000 (18:23 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Nov 2017 02:23:19 +0000 (18:23 -0800)
Pull smp/hotplug updates from Thomas Gleixner:
 "No functional changes, just removal of obsolete and outdated defines,
  macros and documentation"

* 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  cpu/hotplug: Get rid of CPU hotplug notifier leftovers
  cpu/hotplug: Remove obsolete notifier macros

1  2 
include/linux/cpu.h

diff --combined include/linux/cpu.h
index 938ea8ae0ba422925b06d9e0c677eda4dba76eb4,b6e4a598b2cdfeffe1893183b770a02d8d8545b0..a04ef7c15c6a9dd504a288e23d7da3d6322459e2
@@@ -1,4 -1,3 +1,4 @@@
 +/* SPDX-License-Identifier: GPL-2.0 */
  /*
   * include/linux/cpu.h - generic cpu definition
   *
@@@ -56,27 -55,17 +56,17 @@@ extern void unregister_cpu(struct cpu *
  extern ssize_t arch_cpu_probe(const char *, size_t);
  extern ssize_t arch_cpu_release(const char *, size_t);
  #endif
- struct notifier_block;
  
- #define CPU_ONLINE            0x0002 /* CPU (unsigned)v is up */
- #define CPU_UP_PREPARE                0x0003 /* CPU (unsigned)v coming up */
- #define CPU_DEAD              0x0007 /* CPU (unsigned)v dead */
- #define CPU_POST_DEAD         0x0009 /* CPU (unsigned)v dead, cpu_hotplug
-                                       * lock is dropped */
- #define CPU_BROKEN            0x000B /* CPU (unsigned)v did not die properly,
-                                       * perhaps due to preemption. */
- /* Used for CPU hotplug events occurring while tasks are frozen due to a suspend
-  * operation in progress
+ /*
+  * These states are not related to the core CPU hotplug mechanism. They are
+  * used by various (sub)architectures to track internal state
   */
- #define CPU_TASKS_FROZEN      0x0010
- #define CPU_ONLINE_FROZEN     (CPU_ONLINE | CPU_TASKS_FROZEN)
- #define CPU_UP_PREPARE_FROZEN (CPU_UP_PREPARE | CPU_TASKS_FROZEN)
- #define CPU_UP_CANCELED_FROZEN        (CPU_UP_CANCELED | CPU_TASKS_FROZEN)
- #define CPU_DOWN_PREPARE_FROZEN       (CPU_DOWN_PREPARE | CPU_TASKS_FROZEN)
- #define CPU_DOWN_FAILED_FROZEN        (CPU_DOWN_FAILED | CPU_TASKS_FROZEN)
- #define CPU_DEAD_FROZEN               (CPU_DEAD | CPU_TASKS_FROZEN)
+ #define CPU_ONLINE            0x0002 /* CPU is up */
+ #define CPU_UP_PREPARE                0x0003 /* CPU coming up */
+ #define CPU_DEAD              0x0007 /* CPU dead */
+ #define CPU_DEAD_FROZEN               0x0008 /* CPU timed out on unplug */
+ #define CPU_POST_DEAD         0x0009 /* CPU successfully unplugged */
+ #define CPU_BROKEN            0x000B /* CPU did not die properly */
  
  #ifdef CONFIG_SMP
  extern bool cpuhp_tasks_frozen;