--- kernel-source-2.6.17.orig/include/asm-i386/system.h
+++ kernel-source-2.6.17/include/asm-i386/system.h
@@ -299,9 +299,9 @@ #ifndef CONFIG_X86_CMPXCHG
  * a function for each of the sizes we support.
  */
 
-extern unsigned long cmpxchg_386_u8(volatile void *, u8, u8);
-extern unsigned long cmpxchg_386_u16(volatile void *, u16, u16);
-extern unsigned long cmpxchg_386_u32(volatile void *, u32, u32);
+extern unsigned long cmpxchg_386_u8(volatile void *, __u8, __u8);
+extern unsigned long cmpxchg_386_u16(volatile void *, __u16, __u16);
+extern unsigned long cmpxchg_386_u32(volatile void *, __u32, __u32);
 
 static inline unsigned long cmpxchg_386(volatile void *ptr, unsigned long old,
 				      unsigned long new, int size)