[PATCH] i386: PARAVIRT: revert map_pt_hook.

Back out the map_pt_hook to clear the way for kmap_atomic_pte.

Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Zachary Amsden <zach@vmware.com>

2 files changed, 2 insertions, 2 deletions

diff --git a/arch/i386/kernel/paravirt.c b/arch/i386/kernel/paravirt.c
index c7f0cf92925f..13f41b5c887a 100644
--- a/arch/i386/kernel/paravirt.c
+++ b/arch/i386/kernel/paravirt.c
@@ -302,8 +302,6 @@ struct paravirt_ops paravirt_ops = {
         .flush_tlb_single = native_flush_tlb_single,
         .flush_tlb_others = native_flush_tlb_others,
 
-        .map_pt_hook = paravirt_nop,
-
         .alloc_pt = paravirt_nop,
         .alloc_pd = paravirt_nop,
         .alloc_pd_clone = paravirt_nop,
diff --git a/arch/i386/kernel/vmi.c b/arch/i386/kernel/vmi.c
index b8d01c3cbff4..ccad7ee960aa 100644
--- a/arch/i386/kernel/vmi.c
+++ b/arch/i386/kernel/vmi.c
@@ -851,8 +851,10 @@ static inline int __init activate_vmi(void)
                 paravirt_ops.release_pt = vmi_release_pt;
                 paravirt_ops.release_pd = vmi_release_pd;
         }
+#if 0
         para_wrap(map_pt_hook, vmi_map_pt_hook, set_linear_mapping,
                   SetLinearMapping);
+#endif
 
         /*
          * These MUST always be patched.  Don't support indirect jumps