Index: arch/ia32/include/atomic.h
===================================================================
--- arch/ia32/include/atomic.h	(revision b45c443eb976adbe668a3f855f749cf0ad3a5b3f)
+++ arch/ia32/include/atomic.h	(revision 0ffa3ef51d117153ad4c8c5fdb3b525ff042ef01)
@@ -84,6 +84,6 @@
 #define atomic_predec(val) (atomic_postdec(val)-1)
 
-static inline __u32 test_and_set(atomic_t *val) {
-	__u32 v;
+static inline uint32_t test_and_set(atomic_t *val) {
+	uint32_t v;
 	
 	__asm__ volatile (
@@ -99,5 +99,5 @@
 static inline void atomic_lock_arch(atomic_t *val)
 {
-	__u32 tmp;
+	uint32_t tmp;
 
 	preemption_disable();