1 files changed, 0 insertions, 140 deletions
diff --git a/system/xen/xsa/xsa299-4.12-0004-x86-mm-Use-flags-for-_put_page_type-rather-than-a-bo.patch b/system/xen/xsa/xsa299-4.12-0004-x86-mm-Use-flags-for-_put_page_type-rather-than-a-bo.patch
deleted file mode 100644
index d07c233225..0000000000
--- a/system/xen/xsa/xsa299-4.12-0004-x86-mm-Use-flags-for-_put_page_type-rather-than-a-bo.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From db1d801aa8dcb918a27486a6e8d9cf5d7307dec3 Mon Sep 17 00:00:00 2001
-From: George Dunlap <george.dunlap@citrix.com>
-Date: Thu, 10 Oct 2019 17:57:49 +0100
-Subject: [PATCH 04/11] x86/mm: Use flags for _put_page_type rather than a
- boolean
-
-This is in mainly in preparation for _put_page_type taking the
-partial_flags value in the future.  It also makes it easier to read in
-the caller (since you see a flag name rather than `true` or `false`).
-
-No functional change intended.
-
-This is part of XSA-299.
-
-Reported-by: George Dunlap <george.dunlap@citrix.com>
-Signed-off-by: George Dunlap <george.dunlap@citrix.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
----
- xen/arch/x86/mm.c | 25 +++++++++++++------------
- 1 file changed, 13 insertions(+), 12 deletions(-)
-
-diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
-index 3f6f8cc9b8..0740b61af8 100644
---- a/xen/arch/x86/mm.c
-+++ b/xen/arch/x86/mm.c
-@@ -1200,7 +1200,7 @@ get_page_from_l4e(
- }
- #endif /* CONFIG_PV */
- 
--static int _put_page_type(struct page_info *page, bool preemptible,
-+static int _put_page_type(struct page_info *page, unsigned int flags,
-                           struct page_info *ptpg);
- 
- void put_page_from_l1e(l1_pgentry_t l1e, struct domain *l1e_owner)
-@@ -1320,7 +1320,7 @@ static int put_page_from_l2e(l2_pgentry_t l2e, unsigned long pfn,
-               PTF_partial_set )
-         {
-             ASSERT(!(flags & PTF_defer));
--            rc = _put_page_type(pg, true, ptpg);
-+            rc = _put_page_type(pg, PTF_preemptible, ptpg);
-         }
-         else if ( flags & PTF_defer )
-         {
-@@ -1329,7 +1329,7 @@ static int put_page_from_l2e(l2_pgentry_t l2e, unsigned long pfn,
-         }
-         else
-         {
--            rc = _put_page_type(pg, true, ptpg);
-+            rc = _put_page_type(pg, PTF_preemptible, ptpg);
-             if ( likely(!rc) )
-                 put_page(pg);
-         }
-@@ -1366,7 +1366,7 @@ static int put_page_from_l3e(l3_pgentry_t l3e, unsigned long pfn,
-          PTF_partial_set )
-     {
-         ASSERT(!(flags & PTF_defer));
--        return _put_page_type(pg, true, mfn_to_page(_mfn(pfn)));
-+        return _put_page_type(pg, PTF_preemptible, mfn_to_page(_mfn(pfn)));
-     }
- 
-     if ( flags & PTF_defer )
-@@ -1376,7 +1376,7 @@ static int put_page_from_l3e(l3_pgentry_t l3e, unsigned long pfn,
-         return 0;
-     }
- 
--    rc = _put_page_type(pg, true, mfn_to_page(_mfn(pfn)));
-+    rc = _put_page_type(pg, PTF_preemptible, mfn_to_page(_mfn(pfn)));
-     if ( likely(!rc) )
-         put_page(pg);
- 
-@@ -1397,7 +1397,7 @@ static int put_page_from_l4e(l4_pgentry_t l4e, unsigned long pfn,
-               PTF_partial_set )
-         {
-             ASSERT(!(flags & PTF_defer));
--            return _put_page_type(pg, true, mfn_to_page(_mfn(pfn)));
-+            return _put_page_type(pg, PTF_preemptible, mfn_to_page(_mfn(pfn)));
-         }
- 
-         if ( flags & PTF_defer )
-@@ -1407,7 +1407,7 @@ static int put_page_from_l4e(l4_pgentry_t l4e, unsigned long pfn,
-             return 0;
-         }
- 
--        rc = _put_page_type(pg, true, mfn_to_page(_mfn(pfn)));
-+        rc = _put_page_type(pg, PTF_preemptible, mfn_to_page(_mfn(pfn)));
-         if ( likely(!rc) )
-             put_page(pg);
-     }
-@@ -2757,10 +2757,11 @@ static int _put_final_page_type(struct page_info *page, unsigned long type,
- }
- 
- 
--static int _put_page_type(struct page_info *page, bool preemptible,
-+static int _put_page_type(struct page_info *page, unsigned int flags,
-                           struct page_info *ptpg)
- {
-     unsigned long nx, x, y = page->u.inuse.type_info;
-+    bool preemptible = flags & PTF_preemptible;
- 
-     ASSERT(current_locked_page_ne_check(page));
- 
-@@ -2969,7 +2970,7 @@ static int _get_page_type(struct page_info *page, unsigned long type,
- 
-             if ( unlikely(iommu_ret) )
-             {
--                _put_page_type(page, false, NULL);
-+                _put_page_type(page, 0, NULL);
-                 rc = iommu_ret;
-                 goto out;
-             }
-@@ -2996,7 +2997,7 @@ static int _get_page_type(struct page_info *page, unsigned long type,
- 
- void put_page_type(struct page_info *page)
- {
--    int rc = _put_page_type(page, false, NULL);
-+    int rc = _put_page_type(page, 0, NULL);
-     ASSERT(rc == 0);
-     (void)rc;
- }
-@@ -3013,7 +3014,7 @@ int get_page_type(struct page_info *page, unsigned long type)
- 
- int put_page_type_preemptible(struct page_info *page)
- {
--    return _put_page_type(page, true, NULL);
-+    return _put_page_type(page, PTF_preemptible, NULL);
- }
- 
- int get_page_type_preemptible(struct page_info *page, unsigned long type)
-@@ -3030,7 +3031,7 @@ int put_old_guest_table(struct vcpu *v)
-     if ( !v->arch.old_guest_table )
-         return 0;
- 
--    switch ( rc = _put_page_type(v->arch.old_guest_table, true,
-+    switch ( rc = _put_page_type(v->arch.old_guest_table, PTF_preemptible,
-                                  v->arch.old_guest_ptpg) )
-     {
-     case -EINTR:
--- 
-2.23.0
-