From 32fe0684cc758e7624223044e4286f3e7c9f2c92 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun, 28 Aug 2011 23:15:33 +0200
Subject: Disable (<i486)-only WP workaround on Xen & PAE

i386 didn't support PAE anyway.

* i386/i386/locore.S (copyout_retry) [MACH_HYP || PAE]: Remove.
* xen/xen.c (hyp_invalidate_pte): Remove function.
* xen/xen.h (hyp_invalidate_pte): Remove prototype.
---
 xen/xen.c | 7 -------
 xen/xen.h | 1 -
 2 files changed, 8 deletions(-)

(limited to 'xen')

diff --git a/xen/xen.c b/xen/xen.c
index f8f964e..c3c533c 100644
--- a/xen/xen.c
+++ b/xen/xen.c
@@ -30,13 +30,6 @@
 #include "xen.h"
 #include "evt.h"
 
-void hyp_invalidate_pte(pt_entry_t *pte)
-{
-	if (!hyp_mmu_update_pte(kv_to_ma(pte), (*pte) & ~INTEL_PTE_VALID))
-		panic("%s:%d could not set pte %p(%p) to %p(%p)\n",__FILE__,__LINE__,pte,(vm_offset_t) kv_to_ma(pte),*pte,ma_to_pa(*pte));
-	hyp_mmuext_op_void(MMUEXT_TLB_FLUSH_LOCAL);
-}
-
 void hyp_debug()
 {
 	panic("debug");
diff --git a/xen/xen.h b/xen/xen.h
index 6eeb350..2f4d6bd 100644
--- a/xen/xen.h
+++ b/xen/xen.h
@@ -21,7 +21,6 @@
 
 void hyp_init(void);
 void hyp_dev_init(void);
-void hyp_invalidate_pte(pt_entry_t *pte);
 void hyp_idle(void);
 void hyp_p2m_init(void);
 
-- 
cgit v1.2.3