Skip to content

Commit 33cf6e1

Browse files
committed
Fix merge derp
1 parent 4df8183 commit 33cf6e1

1 file changed

Lines changed: 0 additions & 2 deletions

File tree

arch/x86/kernel/paravirt.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ struct paravirt_patch_template pv_ops = {
171171
.irq.save_fl = __PV_IS_CALLEE_SAVE(pv_native_save_fl),
172172
.irq.irq_disable = __PV_IS_CALLEE_SAVE(pv_native_irq_disable),
173173
.irq.irq_enable = __PV_IS_CALLEE_SAVE(pv_native_irq_enable),
174-
#endif /* CONFIG_PARAVIRT_XXL */
175174

176175
/* Irq HLT ops. */
177176
.irq.safe_halt = pv_native_safe_halt,
@@ -182,7 +181,6 @@ struct paravirt_patch_template pv_ops = {
182181
.mmu.flush_tlb_kernel = native_flush_tlb_global,
183182
.mmu.flush_tlb_one_user = native_flush_tlb_one_user,
184183
.mmu.flush_tlb_multi = native_flush_tlb_multi,
185-
.mmu.tlb_remove_table = tlb_remove_table,
186184

187185
.mmu.exit_mmap = paravirt_nop,
188186
.mmu.notify_page_enc_status_changed = paravirt_nop,

0 commit comments

Comments
 (0)