From: Julien Grall <jgrall@amazon.com>
Date: Thu, 19 Nov 2020 19:07:48 +0000 (+0000)
Subject: xen/arm: setup: Call unregister_init_virtual_region() after the last init function
X-Git-Tag: archive/raspbian/4.16.0+51-g0941d6cb-1+rpi1~2^2~42^2~1052
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cf6dbed22ac3c917fd5457014c66840addf2bf0f;p=xen.git

xen/arm: setup: Call unregister_init_virtual_region() after the last init function

discard_init_modules() is an init function, if the path contains a
BUG() or WARN() we still want to get the full stack trace.

The init virtual region is now kept after the last init function has
been called.

Signed-off-by: Julien Grall <jgrall@amazon.com>
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
---

diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index 7fcff9af2a..2532ec9739 100644
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -72,10 +72,11 @@ domid_t __read_mostly max_init_domid;
 
 static __used void init_done(void)
 {
+    discard_initial_modules();
+
     /* Must be done past setting system_state. */
     unregister_init_virtual_region();
 
-    discard_initial_modules();
     free_init_memory();
     startup_cpu_idle_loop();
 }