projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'lsk/v3.10/topic/gator' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
arch
/
x86
/
kvm
/
x86.h
diff --git
a/arch/x86/kvm/x86.h
b/arch/x86/kvm/x86.h
index e224f7a671b66fb23a291cdf25c5eda7f4bdd157..3186542f2fa3bb5069e0729f49450b1dabd1a1bc 100644
(file)
--- a/
arch/x86/kvm/x86.h
+++ b/
arch/x86/kvm/x86.h
@@
-124,5
+124,7
@@
int kvm_write_guest_virt_system(struct x86_emulate_ctxt *ctxt,
extern u64 host_xcr0;
+extern unsigned int min_timer_period_us;
+
extern struct static_key kvm_no_apic_vcpu;
#endif