Commit 98da295b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull SMP hotplug fixes from Thomas Gleixner:
 "Two fixlets for cpu hotplug:

   - Fix a subtle ordering problem with the dummy timer. This happened
     to work before the conversion by chance due to initcall ordering.

   - Fix the function comment for __cpuhp_setup_state()"

* 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  cpu/hotplug: Clarify description of __cpuhp_setup_state() return value
  clocksource/dummy_timer: Move hotplug callback after the real timers
parents eb3a3c07 512f0980

include/linux/cpuhotplug.h

+2 −1
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ enum cpuhp_state { 
	CPUHP_AP_ARM_L2X0_STARTING,

	CPUHP_AP_ARM_ARCH_TIMER_STARTING,

	CPUHP_AP_ARM_GLOBAL_TIMER_STARTING,

	CPUHP_AP_DUMMY_TIMER_STARTING,

	CPUHP_AP_JCORE_TIMER_STARTING,

	CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING,

	CPUHP_AP_ARM_TWD_STARTING,
@@ -115,6 +114,8 @@ enum cpuhp_state { 
	CPUHP_AP_KVM_ARM_VGIC_INIT_STARTING,

	CPUHP_AP_KVM_ARM_VGIC_STARTING,

	CPUHP_AP_KVM_ARM_TIMER_STARTING,

	/* Must be the last timer callback */

	CPUHP_AP_DUMMY_TIMER_STARTING,

	CPUHP_AP_ARM_XEN_STARTING,

	CPUHP_AP_ARM_CORESIGHT_STARTING,

	CPUHP_AP_ARM_CORESIGHT4_STARTING,

kernel/cpu.c

+5 −1
Original line number Diff line number Diff line
@@ -1586,7 +1586,11 @@ EXPORT_SYMBOL_GPL(__cpuhp_state_add_instance); 
 * @startup:	startup callback function

 * @teardown:	teardown callback function

 *

 * Returns 0 if successful, otherwise a proper error code

 * Returns:

 *   On success:

 *      Positive state number if @state is CPUHP_AP_ONLINE_DYN

 *      0 for all other states

 *   On failure: proper (negative) error code

 */

int __cpuhp_setup_state(enum cpuhp_state state,

			const char *name, bool invoke,

CRA Git | Maintained and supported by SUSTech CRA and CCSE