diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-13 11:35:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-13 11:35:03 -0700 |
| commit | 3be5f884f60e9ac66f38c11d92929ba367a86cdb (patch) | |
| tree | b72997a1f85ab72f2eb5df01f6888ebea27d5e3f | |
| parent | 3d7882769b5dc929690f96e0c318c29b97f51018 (diff) | |
| parent | eac779aa509d453a55da0ea4302bdb79c4e0854f (diff) | |
| download | linux-3be5f884f60e9ac66f38c11d92929ba367a86cdb.tar.gz linux-3be5f884f60e9ac66f38c11d92929ba367a86cdb.tar.bz2 linux-3be5f884f60e9ac66f38c11d92929ba367a86cdb.zip | |
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
| -rw-r--r-- | arch/x86/xen/enlighten.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 0e7ef69e8531..d669e9d89001 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -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); |