From 0640eaf552a2c5e270dd02ecc3773a26adc20888 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Wed, 16 Mar 2016 14:18:42 -0500 Subject: [PATCH] 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 Acked-by: Daniel De Graaf --- xen/include/xen/config.h | 1 - xen/include/xsm/xsm.h | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) 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 -- 2.30.2