Re: Re: [Xen-ia64-devel] [PATCH][QEMU] Add IA64-specific code for new qemu.

[Alex Williamson <alex.williamson@hp.com>]

On Wed, 2006-07-26 at 13:41 +0100, Christian Limpach wrote:
> On 7/26/06, Akio Takebe <takebe_akio@jp.fujitsu.com> wrote:
> > Hi, Xiantao
> >
> > Is the following testandset redefine?
> >
> > diff -r bbabdebc54ad tools/ioemu/exec-all.h
> > --- a/tools/ioemu/exec-all.h    Wed Jul 19 21:13:36 2006 +0100
> > +++ b/tools/ioemu/exec-all.h    Tue Jul 25 09:30:05 2006 +0800
> > @@ -391,6 +391,15 @@ static inline int testandset (int *p)
> >  }
> >  #endif
> >
> > +#ifdef __ia64__
> > +#include "ia64_intrinsic.h"
> > +static inline int testandset (int *p)
> 
> I've merged it with the existing __ia64 case.

Hi Christian,

   Looks like we still ended up with both copies.  Can you please apply
the patch below.  Thanks,

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---

diff -r 21918b22746e tools/ioemu/exec-all.h
--- a/tools/ioemu/exec-all.h	Wed Jul 26 10:49:32 2006 -0600
+++ b/tools/ioemu/exec-all.h	Wed Jul 26 11:16:28 2006 -0600
@@ -391,15 +391,6 @@ static inline int testandset (int *p)
 }
 #endif
 
-#ifdef __ia64__
-#include "ia64_intrinsic.h"
-static inline int testandset (int *p)
-{
-    uint32_t o = 0, n = 1;
-    return (int)cmpxchg_acq(p, o, n);
-}
-#endif
-
 #ifdef __s390__
 static inline int testandset (int *p)
 {