[parisc-linux-cvs] fix for atomic.h reserved words

[LaMont Jones]

------- =_aaaaaaaaaa0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <10417.1016725369.1@cranston.fc.hp.com>

Umm, the following patch was committed to fix C++ builds that use atomic.h.
Sorry for the out-of-order processing...  We could use a new kernel-headers
package sometime in the near future.  (Although korinoco still dies because
of libgcc.so...)

lamont

------- =_aaaaaaaaaa0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <10417.1016725369.2@cranston.fc.hp.com>

Index: include/asm-parisc/atomic.h
===================================================================
RCS file: /var/cvs/linux/include/asm-parisc/atomic.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- include/asm-parisc/atomic.h	2001/09/06 09:44:12	1.8
+++ include/asm-parisc/atomic.h	2002/03/21 15:38:24	1.9
@@ -114,18 +114,18 @@ static __inline__ unsigned long __xchg(u
 extern void __cmpxchg_called_with_bad_pointer(void);
 
 /* __cmpxchg_u32/u64 defined in arch/parisc/lib/bitops.c */
-extern unsigned long __cmpxchg_u32(volatile unsigned int *m, unsigned int old, unsigned int new);
-extern unsigned long __cmpxchg_u64(volatile unsigned long *ptr, unsigned long old, unsigned long new);
+extern unsigned long __cmpxchg_u32(volatile unsigned int *m, unsigned int old, unsigned int new_);
+extern unsigned long __cmpxchg_u64(volatile unsigned long *ptr, unsigned long old, unsigned long new_);
 
 /* don't worry...optimizer will get rid of most of this */
 static __inline__ unsigned long
-__cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
+__cmpxchg(volatile void *ptr, unsigned long old, unsigned long new_, int size)
 {
 	switch(size) {
 #ifdef __LP64__
-	case 8: return __cmpxchg_u64((unsigned long *)ptr, old, new);
+	case 8: return __cmpxchg_u64((unsigned long *)ptr, old, new_);
 #endif
-	case 4: return __cmpxchg_u32((unsigned int *)ptr, (unsigned int) old, (unsigned int) new);
+	case 4: return __cmpxchg_u32((unsigned int *)ptr, (unsigned int) old, (unsigned int) new_);
 	}
 	__cmpxchg_called_with_bad_pointer();
 	return old;

------- =_aaaaaaaaaa0--