From: kfraser@localhost.localdomain <kfraser@localhost.localdomain>
Date: Fri, 7 Sep 2007 18:53:57 +0000 (+0100)
Subject: x86/32: Fix domain_relinquish_resources().
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14987^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=705f51e1718a95dda04415bfc88cac0613a5b685;p=xen.git

x86/32: Fix domain_relinquish_resources().
Fixes a host crash on preempted domain_kill().
Signed-off-by: Keir Fraser <keir@xensource.com>
---

diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index f4f6ca47df..49d11ccc63 100644
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -1761,8 +1761,8 @@ int domain_relinquish_resources(struct domain *d)
         /* fallthrough */
 
         /* Relinquish every page of memory. */
-#if CONFIG_PAGING_LEVELS >= 4
     case RELMEM_xen_l4:
+#if CONFIG_PAGING_LEVELS >= 4
         ret = relinquish_memory(d, &d->xenpage_list, PGT_l4_page_table);
         if ( ret )
             return ret;
@@ -1776,8 +1776,8 @@ int domain_relinquish_resources(struct domain *d)
         /* fallthrough */
 #endif
 
-#if CONFIG_PAGING_LEVELS >= 3
 	case RELMEM_xen_l3:
+#if CONFIG_PAGING_LEVELS >= 3
         ret = relinquish_memory(d, &d->xenpage_list, PGT_l3_page_table);
         if ( ret )
             return ret;