[Xen-changelog] [mini-os master] minios: fix build issue with xen_*mb defines

[patchbot@xxxxxxx]

commit e20998fbec0af4d783abb1a0695ab4614064c520
Author:     Juergen Gross <jgross@xxxxxxxx>
AuthorDate: Wed Sep 28 11:50:04 2016 +0200
Commit:     Wei Liu <wei.liu2@xxxxxxxxxx>
CommitDate: Wed Sep 28 12:09:38 2016 +0100

    minios: fix build issue with xen_*mb defines
    
    Commit e35295d724d64e6e025ec31c2e510e448b8641d1 ("mini-os: fix builds
    with uncommon config settings") introduced a bug which will break
    the build, as xc_minios.c will have defined those macros via
    xc_private.h.
    
    Fix this by defining the macros only if compiling a minios source.
    
    Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
    Reviewed-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Acked-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>
---
 include/x86/os.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/x86/os.h b/include/x86/os.h
index 0f5dd6c..fbc2eeb 100644
--- a/include/x86/os.h
+++ b/include/x86/os.h
@@ -511,14 +511,14 @@ static __inline__ unsigned long __ffs(unsigned long word)
 #error "Unsupported architecture"
 #endif
 
-#endif /* ifdef __INSIDE_MINIOS */
-
 /********************* common i386 and x86_64  ****************************/
 #define xen_mb()  mb()
 #define xen_rmb() rmb()
 #define xen_wmb() wmb()
 #define xen_barrier() asm volatile ( "" : : : "memory")
 
+#endif /* ifdef __INSIDE_MINIOS */
+
 #define wrmsr(msr,val1,val2) \
       __asm__ __volatile__("wrmsr" \
                            : /* no outputs */ \
--
generated by git-patchbot for /home/xen/git/mini-os.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog