From: Julien Grall <julien.grall@arm.com>
Date: Tue, 20 Jun 2017 12:48:10 +0000 (+0200)
Subject: mm: don't use _{g,m}fn for defining INVALID_{G,M}FN
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=725039d39ef10c6e3c59ba4a2511188281133b19;p=people%2Froyger%2Fxen.git

mm: don't use _{g,m}fn for defining INVALID_{G,M}FN

INVALID_{G,M}FN are defined using static inline helpers _{g,m}fn.
This means, they cannot be used to initialize a build time static variable:

In file included from mm.c:24:0:
xen/xen/include/xen/mm.h:59:26: error: initializer element is not constant
 #define INVALID_MFN      _mfn(~0UL)

Signed-off-by: Julien Grall <julien.grall@arm.com>
Acked-by: Tim Deegan <tim@xen.org>
[jb: add parentheses and const]
Acked-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h
index db057f605d..3d3f31be93 100644
--- a/xen/include/xen/mm.h
+++ b/xen/include/xen/mm.h
@@ -56,7 +56,7 @@
 
 TYPE_SAFE(unsigned long, mfn);
 #define PRI_mfn          "05lx"
-#define INVALID_MFN      _mfn(~0UL)
+#define INVALID_MFN      ((const mfn_t){ ~0UL })
 
 #ifndef mfn_t
 #define mfn_t /* Grep fodder: mfn_t, _mfn() and mfn_x() are defined above */
@@ -89,7 +89,7 @@ static inline bool_t mfn_eq(mfn_t x, mfn_t y)
 
 TYPE_SAFE(unsigned long, gfn);
 #define PRI_gfn          "05lx"
-#define INVALID_GFN      _gfn(~0UL)
+#define INVALID_GFN      ((const gfn_t){ ~0UL })
 
 #ifndef gfn_t
 #define gfn_t /* Grep fodder: gfn_t, _gfn() and gfn_x() are defined above */