projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v5.17-rc8' into sched/core, to pick up fixes
[linux-block.git]
/
arch
/
x86
/
kvm
/
x86.c
diff --git
a/arch/x86/kvm/x86.c
b/arch/x86/kvm/x86.c
index eb4029660bd9f3769a8931fc30b556f4439cfc8e..7bfcafc6e7ceaf14ff08027720b393dc788e975f 100644
(file)
--- a/
arch/x86/kvm/x86.c
+++ b/
arch/x86/kvm/x86.c
@@
-8853,7
+8853,7
@@
int kvm_arch_init(void *opaque)
}
if (pi_inject_timer == -1)
- pi_inject_timer = housekeeping_enabled(HK_
FLAG
_TIMER);
+ pi_inject_timer = housekeeping_enabled(HK_
TYPE
_TIMER);
#ifdef CONFIG_X86_64
pvclock_gtod_register_notifier(&pvclock_gtod_notifier);