diff options
| author | Doug Goldstein <cardoe@cardoe.com> | 2016-03-16 14:18:42 -0500 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2016-03-25 11:29:44 -0400 |
| commit | 0640eaf552a2c5e270dd02ecc3773a26adc20888 (patch) | |
| tree | ac95a83f8498baaaace69b1b52f7f202f673dfff /xen/include/xsm | |
| parent | 0d42d461c21685258ac9c17bec7eaeb9ac2fce4c (diff) | |
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>
Diffstat (limited to 'xen/include/xsm')
| -rw-r--r-- | xen/include/xsm/xsm.h | 7 |
1 files changed, 5 insertions, 2 deletions
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 |