Index: arch/ia64/include/cpu.h
===================================================================
--- arch/ia64/include/cpu.h	(revision 1bb2e7a3ca385e067db5d9c4c5654c28f92af609)
+++ arch/ia64/include/cpu.h	(revision 0ffa3ef51d117153ad4c8c5fdb3b525ff042ef01)
@@ -44,6 +44,6 @@
 
 struct cpu_arch {
-	__u64 cpuid0;
-	__u64 cpuid1;
+	uint64_t cpuid0;
+	uint64_t cpuid1;
 	cpuid3_t cpuid3;
 };
@@ -55,7 +55,7 @@
  * @return Value of CPUID[n] register.
  */
-static inline __u64 cpuid_read(int n)
+static inline uint64_t cpuid_read(int n)
 {
-	__u64 v;
+	uint64_t v;
 	
 	__asm__ volatile ("mov %0 = cpuid[%1]\n" : "=r" (v) : "r" (n));