diff options
| -rw-r--r-- | arch/x86/kernel/kvm.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index c664d515f613..63b0ec8d3d4a 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | struct kvm_para_state { | 34 | struct kvm_para_state { |
| 35 | u8 mmu_queue[MMU_QUEUE_SIZE]; | 35 | u8 mmu_queue[MMU_QUEUE_SIZE]; |
| 36 | int mmu_queue_len; | 36 | int mmu_queue_len; |
| 37 | enum paravirt_lazy_mode mode; | ||
| 38 | }; | 37 | }; |
| 39 | 38 | ||
| 40 | static DEFINE_PER_CPU(struct kvm_para_state, para_state); | 39 | static DEFINE_PER_CPU(struct kvm_para_state, para_state); |
| @@ -77,7 +76,7 @@ static void kvm_deferred_mmu_op(void *buffer, int len) | |||
| 77 | { | 76 | { |
| 78 | struct kvm_para_state *state = kvm_para_state(); | 77 | struct kvm_para_state *state = kvm_para_state(); |
| 79 | 78 | ||
| 80 | if (state->mode != PARAVIRT_LAZY_MMU) { | 79 | if (paravirt_get_lazy_mode() != PARAVIRT_LAZY_MMU) { |
| 81 | kvm_mmu_op(buffer, len); | 80 | kvm_mmu_op(buffer, len); |
| 82 | return; | 81 | return; |
| 83 | } | 82 | } |
| @@ -185,10 +184,7 @@ static void kvm_release_pt(unsigned long pfn) | |||
| 185 | 184 | ||
| 186 | static void kvm_enter_lazy_mmu(void) | 185 | static void kvm_enter_lazy_mmu(void) |
| 187 | { | 186 | { |
| 188 | struct kvm_para_state *state = kvm_para_state(); | ||
| 189 | |||
| 190 | paravirt_enter_lazy_mmu(); | 187 | paravirt_enter_lazy_mmu(); |
| 191 | state->mode = paravirt_get_lazy_mode(); | ||
| 192 | } | 188 | } |
| 193 | 189 | ||
| 194 | static void kvm_leave_lazy_mmu(void) | 190 | static void kvm_leave_lazy_mmu(void) |
| @@ -197,7 +193,6 @@ static void kvm_leave_lazy_mmu(void) | |||
| 197 | 193 | ||
| 198 | mmu_queue_flush(state); | 194 | mmu_queue_flush(state); |
| 199 | paravirt_leave_lazy_mmu(); | 195 | paravirt_leave_lazy_mmu(); |
| 200 | state->mode = paravirt_get_lazy_mode(); | ||
| 201 | } | 196 | } |
| 202 | 197 | ||
| 203 | static void __init paravirt_ops_setup(void) | 198 | static void __init paravirt_ops_setup(void) |
