From: Doug Goldstein <cardoe@cardoe.com>
Date: Wed, 16 Mar 2016 19:18:42 +0000 (-0500)
Subject: xsm: only define XSM_MAGIC in xsm.h
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~1490
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0640eaf552a2c5e270dd02ecc3773a26adc20888;p=xen.git

xsm: only define XSM_MAGIC in xsm.h

Rather than have XSM_MAGIC set in the global xen/config.h and set in
xsm.h if it's unset, just set it once in xsm.h since its only used in
files that already include xsm.h

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>
---

diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h
index 96f5539ae7..3f8c53dd88 100644
--- a/xen/include/xen/config.h
+++ b/xen/include/xen/config.h
@@ -79,7 +79,6 @@
 #define STR(...) __STR(__VA_ARGS__)
 
 #ifdef CONFIG_FLASK
-#define XSM_MAGIC 0xf97cff8c
 /* Maintain statistics on the access vector cache */
 #define FLASK_AVC_STATS 1
 #endif
diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h
index 5ecbee08e0..f3d87ab67f 100644
--- a/xen/include/xsm/xsm.h
+++ b/xen/include/xsm/xsm.h
@@ -23,8 +23,11 @@ DEFINE_XEN_GUEST_HANDLE(xsm_op_t);
 
 /* policy magic number (defined by XSM_MAGIC) */
 typedef u32 xsm_magic_t;
-#ifndef XSM_MAGIC
-#define XSM_MAGIC 0x00000000
+
+#ifdef CONFIG_FLASK
+#define XSM_MAGIC 0xf97cff8c
+#else
+#define XSM_MAGIC 0x0
 #endif
 
 /* These annotations are used by callers and in dummy.h to document the