vserver 2.0 rc7

[linux-2.6.git] / include / asm-ppc / system.h

diff --git a/include/asm-ppc/system.h b/include/asm-ppc/system.h
index 5cff9a0..82395f3 100644 (file)
--- a/include/asm-ppc/system.h
+++ b/include/asm-ppc/system.h
@@ -152,9 +152,9 @@ extern inline void * xchg_ptr(void * m, void * val)
 #define __HAVE_ARCH_CMPXCHG    1
 
 static __inline__ unsigned long
-__cmpxchg_u32(volatile int *p, int old, int new)
+__cmpxchg_u32(volatile unsigned int *p, unsigned int old, unsigned int new)
 {
-       int prev;
+       unsigned int prev;
 
        __asm__ __volatile__ ("\n\
 1:     lwarx   %0,0,%2 \n\
@@ -201,5 +201,7 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
                                    (unsigned long)_n_, sizeof(*(ptr))); \
   })
 
+#define arch_align_stack(x) (x)
+
 #endif /* __KERNEL__ */
 #endif /* __PPC_SYSTEM_H */