oops, undo accidental patch

[ghc-hetmet.git] / ghc / includes / SMP.h

diff --git a/ghc/includes/SMP.h b/ghc/includes/SMP.h
index f4c8605..5974c96 100644 (file)
--- a/ghc/includes/SMP.h
+++ b/ghc/includes/SMP.h
@@ -63,7 +63,7 @@ cas(StgVolatilePtr p, StgWord o, StgWord n)
 {
 #if i386_HOST_ARCH || x86_64_HOST_ARCH
     __asm__ __volatile__ (
-         "lock cmpxchg %3,%1"
+         "lock/cmpxchg %3,%1"
           :"=a"(o), "=m" (*(volatile unsigned int *)p) 
           :"0" (o), "r" (n));
     return o;
@@ -121,7 +121,7 @@ lockClosure(StgClosure *p)
     do {
        nat i = 0;
        do {
-           info = xchg((P_)&p->header.info, (W_)&stg_WHITEHOLE_info);
+           info = xchg((P_)(void *)&p->header.info, (W_)&stg_WHITEHOLE_info);
            if (info != (W_)&stg_WHITEHOLE_info) return (StgInfoTable *)info;
        } while (++i < SPIN_COUNT);
        yieldThread();