From: Jan Beulich <jbeulich@suse.com>
Date: Tue, 6 Jun 2017 12:37:12 +0000 (+0200)
Subject: x86/HAP: don't open code clear_domain_page()
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~2088
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3127e85ba934a2be8c16b3277af88ccce948946a;p=xen.git

x86/HAP: don't open code clear_domain_page()

Also drop a stray initializer.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: George Dunlap <george.dunlap@citrix.com>
---

diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c
index 8476269c14..872e2a9cb1 100644
--- a/xen/arch/x86/mm/hap/hap.c
+++ b/xen/arch/x86/mm/hap/hap.c
@@ -248,8 +248,7 @@ static void hap_clean_dirty_bitmap(struct domain *d)
 /************************************************/
 static struct page_info *hap_alloc(struct domain *d)
 {
-    struct page_info *pg = NULL;
-    void *p;
+    struct page_info *pg;
 
     ASSERT(paging_locked_by_me(d));
 
@@ -259,9 +258,7 @@ static struct page_info *hap_alloc(struct domain *d)
 
     d->arch.paging.hap.free_pages--;
 
-    p = __map_domain_page(pg);
-    clear_page(p);
-    unmap_domain_page(p);
+    clear_domain_page(page_to_mfn(pg));
 
     return pg;
 }