diff options
author | Matthew Wilcox <matthew@wil.cx> | 2009-05-22 16:49:49 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2009-06-17 12:33:49 -0400 |
commit | e088a4ad7fa53c3dc3c29f930025f41ccf01953e (patch) | |
tree | 07b012952bbbaccfe4ef3bb44b1ea0a3a3bb3868 /arch/ia64/mm/tlb.c | |
parent | e56e2dcd381d9ec35379328f332221581eda4787 (diff) |
[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>
Diffstat (limited to 'arch/ia64/mm/tlb.c')
-rw-r--r-- | arch/ia64/mm/tlb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c index b9f3d7bbb338..f426dc78d959 100644 --- a/arch/ia64/mm/tlb.c +++ b/arch/ia64/mm/tlb.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include <asm/tlb.h> | 34 | #include <asm/tlb.h> |
35 | 35 | ||
36 | static struct { | 36 | static struct { |
37 | unsigned long mask; /* mask of supported purge page-sizes */ | 37 | u64 mask; /* mask of supported purge page-sizes */ |
38 | unsigned long max_bits; /* log2 of largest supported purge page-size */ | 38 | unsigned long max_bits; /* log2 of largest supported purge page-size */ |
39 | } purge; | 39 | } purge; |
40 | 40 | ||
@@ -328,7 +328,7 @@ void __devinit | |||
328 | ia64_tlb_init (void) | 328 | ia64_tlb_init (void) |
329 | { | 329 | { |
330 | ia64_ptce_info_t uninitialized_var(ptce_info); /* GCC be quiet */ | 330 | ia64_ptce_info_t uninitialized_var(ptce_info); /* GCC be quiet */ |
331 | unsigned long tr_pgbits; | 331 | u64 tr_pgbits; |
332 | long status; | 332 | long status; |
333 | pal_vm_info_1_u_t vm_info_1; | 333 | pal_vm_info_1_u_t vm_info_1; |
334 | pal_vm_info_2_u_t vm_info_2; | 334 | pal_vm_info_2_u_t vm_info_2; |