Juergen Gross, on Wed 28 Sep 2016 11:50:04 +0200, wrote: > 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 <jgr...@suse.com>
Acked-by: Samuel Thibault <samuel.thiba...@ens-lyon.org> > --- > 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 */ \ > -- > 2.6.6 > -- Samuel X-Favorit-Cartoon: Calvin and Hobbes -+- Mail header of Wim van Dorst -+- _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel