From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu, 6 Dec 2012 09:22:31 +0000 (+0000)
Subject: mini-os: drop shutdown variables when CONFIG_XENBUS=n
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~7567
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=62c21392fc20e5ddd23e5c4bb699f1f613d918a0;p=xen.git

mini-os: drop shutdown variables when CONFIG_XENBUS=n

Shutdown variables are meaningless when CONFIG_XENBUS=n since no
shutdown event will ever happen.  Better make sure that no code tries
to use it and never get the hoped shutdown event.

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Committed-by: Keir Fraser <keir@xen.org>
---

diff --git a/extras/mini-os/kernel.c b/extras/mini-os/kernel.c
index f2f70f6c15..0313ec8715 100644
--- a/extras/mini-os/kernel.c
+++ b/extras/mini-os/kernel.c
@@ -48,9 +48,11 @@
 
 uint8_t xen_features[XENFEAT_NR_SUBMAPS * 32];
 
+#ifdef CONFIG_XENBUS
 unsigned int do_shutdown = 0;
 unsigned int shutdown_reason;
 DECLARE_WAIT_QUEUE_HEAD(shutdown_queue);
+#endif
 
 void setup_xen_features(void)
 {