Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3be5f884 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-4.14c-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen fixlet from Juergen Gross:
 "A minor fix correcting the cpu hotplug name for Xen guests"

* tag 'for-linus-4.14c-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/vcpu: Use a unified name about cpu hotplug state for pv and pvhvm
parents 3d788276 eac779aa

arch/x86/xen/enlighten.c

+2 −2
Original line number Diff line number Diff line
@@ -93,11 +93,11 @@ int xen_cpuhp_setup(int (*cpu_up_prepare_cb)(unsigned int), 
	int rc;



	rc = cpuhp_setup_state_nocalls(CPUHP_XEN_PREPARE,

				       "x86/xen/hvm_guest:prepare",

				       "x86/xen/guest:prepare",

				       cpu_up_prepare_cb, cpu_dead_cb);

	if (rc >= 0) {

		rc = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN,

					       "x86/xen/hvm_guest:online",

					       "x86/xen/guest:online",

					       xen_cpu_up_online, NULL);

		if (rc < 0)

			cpuhp_remove_state_nocalls(CPUHP_XEN_PREPARE);