diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-26 09:43:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-26 09:43:34 -0800 |
| commit | 64d6a12094f35d644540c15440874723b1887f9d (patch) | |
| tree | 84a3517ad84f18504abf72f4280885d15ceb32c9 /include/linux/cpuhotplug.h | |
| parent | cd4771f7709211082cbc41dc1f5b2be774ef1604 (diff) | |
| parent | 4df4cb9e99f83b70d54bc0e25081ac23cceafcbc (diff) | |
| download | linux-stable-64d6a12094f35d644540c15440874723b1887f9d.tar.gz linux-stable-64d6a12094f35d644540c15440874723b1887f9d.tar.bz2 linux-stable-64d6a12094f35d644540c15440874723b1887f9d.zip | |
Merge branch 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 hyperv updates from Ingo Molnar:
"Misc updates to the hyperv guest code:
- Rework clockevents initialization to better support hibernation
- Allow guests to enable InvariantTSC
- Micro-optimize send_ipi_one"
* 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/hyperv: Initialize clockevents earlier in CPU onlining
x86/hyperv: Allow guests to enable InvariantTSC
x86/hyperv: Micro-optimize send_ipi_one()
Diffstat (limited to 'include/linux/cpuhotplug.h')
| -rw-r--r-- | include/linux/cpuhotplug.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index 89d75edb5750..e51ee772b9f5 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -129,6 +129,7 @@ enum cpuhp_state { CPUHP_AP_ARC_TIMER_STARTING, CPUHP_AP_RISCV_TIMER_STARTING, CPUHP_AP_CSKY_TIMER_STARTING, + CPUHP_AP_HYPERV_TIMER_STARTING, CPUHP_AP_KVM_STARTING, CPUHP_AP_KVM_ARM_VGIC_INIT_STARTING, CPUHP_AP_KVM_ARM_VGIC_STARTING, |