From: Julien Grall <julien@xen.org>
Date: Sun, 17 Jul 2022 13:11:27 +0000 (+0100)
Subject: Revert "xen/arm: mm: Add more ASSERT() in {destroy, modify}_xen_mappings()"
X-Git-Tag: archive/raspbian/4.17.0-1+rpi1^2~33^2~436
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a5fb66f4513c2c2d222dcc3753163b15690bd003;p=xen.git

Revert "xen/arm: mm: Add more ASSERT() in {destroy, modify}_xen_mappings()"

This reverts commit 9b962e618313109882b6ca78cf1e09f43c9d6e62. This
was committed by mistake (lack an x86 ack).
---

diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c
index 9a2a29abe2..009b8cd9ef 100644
--- a/xen/arch/arm/mm.c
+++ b/xen/arch/arm/mm.c
@@ -1368,18 +1368,14 @@ int populate_pt_range(unsigned long virt, unsigned long nr_mfns)
     return xen_pt_update(virt, INVALID_MFN, nr_mfns, _PAGE_POPULATE);
 }
 
-int destroy_xen_mappings(unsigned long s, unsigned long e)
+int destroy_xen_mappings(unsigned long v, unsigned long e)
 {
-    ASSERT(IS_ALIGNED(s, PAGE_SIZE));
-    ASSERT(IS_ALIGNED(e, PAGE_SIZE));
-    ASSERT(s <= e);
-    return xen_pt_update(s, INVALID_MFN, (e - s) >> PAGE_SHIFT, 0);
+    ASSERT(v <= e);
+    return xen_pt_update(v, INVALID_MFN, (e - v) >> PAGE_SHIFT, 0);
 }
 
 int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int flags)
 {
-    ASSERT(IS_ALIGNED(s, PAGE_SIZE));
-    ASSERT(IS_ALIGNED(e, PAGE_SIZE));
     ASSERT(s <= e);
     return xen_pt_update(s, INVALID_MFN, (e - s) >> PAGE_SHIFT, flags);
 }
diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h
index 6dee421bb8..3be754da92 100644
--- a/xen/include/xen/mm.h
+++ b/xen/include/xen/mm.h
@@ -101,7 +101,7 @@ int map_pages_to_xen(
     unsigned int flags);
 /* Alter the permissions of a range of Xen virtual address space. */
 int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int flags);
-int destroy_xen_mappings(unsigned long s, unsigned long e);
+int destroy_xen_mappings(unsigned long v, unsigned long e);
 /* Retrieve the MFN mapped by VA in Xen virtual address space. */
 mfn_t xen_map_to_mfn(unsigned long va);