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 branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/rusty/linux...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
x86
/
kernel
/
kvm.c
diff --git
a/arch/x86/kernel/kvm.c
b/arch/x86/kernel/kvm.c
index c664d515f613576c7ccd1168afcc47bf897a0855..63b0ec8d3d4a4d8856ed21f7f9a174d7732c5ce0 100644
(file)
--- a/
arch/x86/kernel/kvm.c
+++ b/
arch/x86/kernel/kvm.c
@@
-34,7
+34,6
@@
struct kvm_para_state {
u8 mmu_queue[MMU_QUEUE_SIZE];
int mmu_queue_len;
struct kvm_para_state {
u8 mmu_queue[MMU_QUEUE_SIZE];
int mmu_queue_len;
- enum paravirt_lazy_mode mode;
};
static DEFINE_PER_CPU(struct kvm_para_state, para_state);
};
static DEFINE_PER_CPU(struct kvm_para_state, para_state);
@@
-77,7
+76,7
@@
static void kvm_deferred_mmu_op(void *buffer, int len)
{
struct kvm_para_state *state = kvm_para_state();
{
struct kvm_para_state *state = kvm_para_state();
- if (
state->mode
!= PARAVIRT_LAZY_MMU) {
+ if (
paravirt_get_lazy_mode()
!= PARAVIRT_LAZY_MMU) {
kvm_mmu_op(buffer, len);
return;
}
kvm_mmu_op(buffer, len);
return;
}
@@
-185,10
+184,7
@@
static void kvm_release_pt(unsigned long pfn)
static void kvm_enter_lazy_mmu(void)
{
static void kvm_enter_lazy_mmu(void)
{
- struct kvm_para_state *state = kvm_para_state();
-
paravirt_enter_lazy_mmu();
paravirt_enter_lazy_mmu();
- state->mode = paravirt_get_lazy_mode();
}
static void kvm_leave_lazy_mmu(void)
}
static void kvm_leave_lazy_mmu(void)
@@
-197,7
+193,6
@@
static void kvm_leave_lazy_mmu(void)
mmu_queue_flush(state);
paravirt_leave_lazy_mmu();
mmu_queue_flush(state);
paravirt_leave_lazy_mmu();
- state->mode = paravirt_get_lazy_mode();
}
static void __init paravirt_ops_setup(void)
}
static void __init paravirt_ops_setup(void)