From: Jan Beulich <jbeulich@suse.com>
Date: Tue, 6 Jun 2017 12:33:47 +0000 (+0200)
Subject: x86/PoD: drop a pointless local variable
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~2093
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=08d3fff66ef74f7ad4c71dd0a19bf528e70ed22e;p=xen.git

x86/PoD: drop a pointless local variable

... and move another one into a more narrow scope.

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

diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c
index d5fea7209b..4085b7f752 100644
--- a/xen/arch/x86/mm/p2m-pod.c
+++ b/xen/arch/x86/mm/p2m-pod.c
@@ -1180,8 +1180,6 @@ guest_physmap_mark_populate_on_demand(struct domain *d, unsigned long gfn,
 {
     struct p2m_domain *p2m = p2m_get_hostp2m(d);
     unsigned long i, n, pod_count = 0;
-    p2m_type_t ot;
-    mfn_t omfn;
     int rc = 0;
 
     if ( !paging_mode_translate(d) )
@@ -1194,10 +1192,11 @@ guest_physmap_mark_populate_on_demand(struct domain *d, unsigned long gfn,
     /* Make sure all gpfns are unused */
     for ( i = 0; i < (1UL << order); i += n )
     {
+        p2m_type_t ot;
         p2m_access_t a;
         unsigned int cur_order;
 
-        omfn = p2m->get_entry(p2m, gfn + i, &ot, &a, 0, &cur_order, NULL);
+        p2m->get_entry(p2m, gfn + i, &ot, &a, 0, &cur_order, NULL);
         n = 1UL << min(order, cur_order);
         if ( p2m_is_ram(ot) )
         {