summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'tags/2.6.21-2/50010_remove-pte_offset_map-redefinition.patch')
-rw-r--r--tags/2.6.21-2/50010_remove-pte_offset_map-redefinition.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/tags/2.6.21-2/50010_remove-pte_offset_map-redefinition.patch b/tags/2.6.21-2/50010_remove-pte_offset_map-redefinition.patch
new file mode 100644
index 0000000..9e2426a
--- /dev/null
+++ b/tags/2.6.21-2/50010_remove-pte_offset_map-redefinition.patch
@@ -0,0 +1,36 @@
+--- linux-2.6.21-xen.orig/include/asm-i386/mach-xen/asm/pgtable.h 2008-02-22 15:17:29.000000000 -0800
++++ linux-2.6.21-xen/include/asm-i386/mach-xen/asm/pgtable.h 2008-02-22 15:19:55.000000000 -0800
+@@ -273,7 +273,6 @@
+ */
+ #define pte_update(mm, addr, ptep) do { } while (0)
+ #define pte_update_defer(mm, addr, ptep) do { } while (0)
+-#define paravirt_map_pt_hook(slot, va, pfn) do { } while (0)
+ #endif
+
+ /*
+@@ -460,25 +459,6 @@
+ #endif
+
+ #if defined(CONFIG_HIGHPTE)
+-#define pte_offset_map(dir, address) \
+-({ \
+- pte_t *__ptep; \
+- unsigned pfn = pmd_val(*(dir)) >> PAGE_SHIFT; \
+- __ptep = (pte_t *)kmap_atomic_pte(pfn_to_page(pfn),KM_PTE0);\
+- paravirt_map_pt_hook(KM_PTE0,__ptep, pfn); \
+- __ptep = __ptep + pte_index(address); \
+- __ptep; \
+-})
+-#define pte_offset_map_nested(dir, address) \
+-({ \
+- pte_t *__ptep; \
+- unsigned pfn = pmd_val(*(dir)) >> PAGE_SHIFT; \
+- __ptep = (pte_t *)kmap_atomic_pte(pfn_to_page(pfn),KM_PTE1);\
+- paravirt_map_pt_hook(KM_PTE1,__ptep, pfn); \
+- __ptep = __ptep + pte_index(address); \
+- __ptep; \
+-})
+-
+ #define pte_offset_map(dir, address) \
+ ((pte_t *)kmap_atomic_pte(pmd_page(*(dir)),KM_PTE0) + \
+ pte_index(address))