[IA64] Convert ia64 to use int-ll64.h
It is generally agreed that it would be beneficial for u64 to be an unsigned long long on all architectures. ia64 (in common with several other 64-bit architectures) currently uses unsigned long. Migrating piecemeal is too painful; this giant patch fixes all compilation warnings and errors that come as a result of switching to use int-ll64.h. Note that userspace will still see __u64 defined as unsigned long. This is important as it affects C++ name mangling. [Updated by Tony Luck to change efi.h:efi_freemem_callback_t to use u64 for start/end rather than unsigned long] Signed-off-by: Matthew Wilcox <willy@linux.intel.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:

committed by
Tony Luck

parent
e56e2dcd38
commit
e088a4ad7f
@@ -388,7 +388,7 @@ register unsigned long ia64_r13 asm ("r13") __used;
|
||||
|
||||
#define ia64_native_thash(addr) \
|
||||
({ \
|
||||
__u64 ia64_intri_res; \
|
||||
unsigned long ia64_intri_res; \
|
||||
asm volatile ("thash %0=%1" : "=r"(ia64_intri_res) : "r" (addr)); \
|
||||
ia64_intri_res; \
|
||||
})
|
||||
@@ -419,7 +419,7 @@ register unsigned long ia64_r13 asm ("r13") __used;
|
||||
|
||||
#define ia64_tpa(addr) \
|
||||
({ \
|
||||
__u64 ia64_pa; \
|
||||
unsigned long ia64_pa; \
|
||||
asm volatile ("tpa %0 = %1" : "=r"(ia64_pa) : "r"(addr) : "memory"); \
|
||||
ia64_pa; \
|
||||
})
|
||||
@@ -444,35 +444,35 @@ register unsigned long ia64_r13 asm ("r13") __used;
|
||||
|
||||
#define ia64_native_get_cpuid(index) \
|
||||
({ \
|
||||
__u64 ia64_intri_res; \
|
||||
unsigned long ia64_intri_res; \
|
||||
asm volatile ("mov %0=cpuid[%r1]" : "=r"(ia64_intri_res) : "rO"(index)); \
|
||||
ia64_intri_res; \
|
||||
})
|
||||
|
||||
#define __ia64_get_dbr(index) \
|
||||
({ \
|
||||
__u64 ia64_intri_res; \
|
||||
unsigned long ia64_intri_res; \
|
||||
asm volatile ("mov %0=dbr[%1]" : "=r"(ia64_intri_res) : "r"(index)); \
|
||||
ia64_intri_res; \
|
||||
})
|
||||
|
||||
#define ia64_get_ibr(index) \
|
||||
({ \
|
||||
__u64 ia64_intri_res; \
|
||||
unsigned long ia64_intri_res; \
|
||||
asm volatile ("mov %0=ibr[%1]" : "=r"(ia64_intri_res) : "r"(index)); \
|
||||
ia64_intri_res; \
|
||||
})
|
||||
|
||||
#define ia64_get_pkr(index) \
|
||||
({ \
|
||||
__u64 ia64_intri_res; \
|
||||
unsigned long ia64_intri_res; \
|
||||
asm volatile ("mov %0=pkr[%1]" : "=r"(ia64_intri_res) : "r"(index)); \
|
||||
ia64_intri_res; \
|
||||
})
|
||||
|
||||
#define ia64_get_pmc(index) \
|
||||
({ \
|
||||
__u64 ia64_intri_res; \
|
||||
unsigned long ia64_intri_res; \
|
||||
asm volatile ("mov %0=pmc[%1]" : "=r"(ia64_intri_res) : "r"(index)); \
|
||||
ia64_intri_res; \
|
||||
})
|
||||
@@ -480,14 +480,14 @@ register unsigned long ia64_r13 asm ("r13") __used;
|
||||
|
||||
#define ia64_native_get_pmd(index) \
|
||||
({ \
|
||||
__u64 ia64_intri_res; \
|
||||
unsigned long ia64_intri_res; \
|
||||
asm volatile ("mov %0=pmd[%1]" : "=r"(ia64_intri_res) : "r"(index)); \
|
||||
ia64_intri_res; \
|
||||
})
|
||||
|
||||
#define ia64_native_get_rr(index) \
|
||||
({ \
|
||||
__u64 ia64_intri_res; \
|
||||
unsigned long ia64_intri_res; \
|
||||
asm volatile ("mov %0=rr[%1]" : "=r"(ia64_intri_res) : "r" (index)); \
|
||||
ia64_intri_res; \
|
||||
})
|
||||
|
Reference in New Issue
Block a user