[CRIU] [PATCH 1/7] arch: x86 -- Use stdint types in cmpxchng.h

[Cyrill Gorcunov]

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 criu/arch/x86/include/asm/cmpxchg.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/criu/arch/x86/include/asm/cmpxchg.h b/criu/arch/x86/include/asm/cmpxchg.h
index 600d0a7fff84..afed44055d0f 100644
--- a/criu/arch/x86/include/asm/cmpxchg.h
+++ b/criu/arch/x86/include/asm/cmpxchg.h
@@ -1,7 +1,7 @@
 #ifndef __CR_CMPXCHG_H__
 #define __CR_CMPXCHG_H__
 
-#include "asm/int.h"
+#include <stdint.h>
 
 #define __X86_CASE_B	1
 #define __X86_CASE_W	2
@@ -59,7 +59,7 @@
 	switch (size) {							\
 	case __X86_CASE_B:						\
 	{								\
-		volatile u8 *__ptr = (volatile u8 *)(ptr);		\
+		volatile uint8_t *__ptr = (volatile uint8_t *)(ptr);	\
 		asm volatile(lock "cmpxchgb %2,%1"			\
 			     : "=a" (__ret), "+m" (*__ptr)		\
 			     : "q" (__new), "0" (__old)			\
@@ -68,7 +68,7 @@
 	}								\
 	case __X86_CASE_W:						\
 	{								\
-		volatile u16 *__ptr = (volatile u16 *)(ptr);		\
+		volatile uint16_t *__ptr = (volatile uint16_t *)(ptr);	\
 		asm volatile(lock "cmpxchgw %2,%1"			\
 			     : "=a" (__ret), "+m" (*__ptr)		\
 			     : "r" (__new), "0" (__old)			\
@@ -77,7 +77,7 @@
 	}								\
 	case __X86_CASE_L:						\
 	{								\
-		volatile u32 *__ptr = (volatile u32 *)(ptr);		\
+		volatile uint32_t *__ptr = (volatile uint32_t *)(ptr);	\
 		asm volatile(lock "cmpxchgl %2,%1"			\
 			     : "=a" (__ret), "+m" (*__ptr)		\
 			     : "r" (__new), "0" (__old)			\
@@ -86,7 +86,7 @@
 	}								\
 	case __X86_CASE_Q:						\
 	{								\
-		volatile u64 *__ptr = (volatile u64 *)(ptr);		\
+		volatile uint64_t *__ptr = (volatile uint64_t *)(ptr);	\
 		asm volatile(lock "cmpxchgq %2,%1"			\
 			     : "=a" (__ret), "+m" (*__ptr)		\
 			     : "r" (__new), "0" (__old)			\
-- 
2.7.4