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/kernel/uncached.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/kernel/uncached.c')
-rw-r--r-- | arch/ia64/kernel/uncached.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ia64/kernel/uncached.c b/arch/ia64/kernel/uncached.c index 8eff8c1d40a6..e6ac3c332d17 100644 --- a/arch/ia64/kernel/uncached.c +++ b/arch/ia64/kernel/uncached.c | |||
@@ -249,8 +249,7 @@ EXPORT_SYMBOL(uncached_free_page); | |||
249 | * Called at boot time to build a map of pages that can be used for | 249 | * Called at boot time to build a map of pages that can be used for |
250 | * memory special operations. | 250 | * memory special operations. |
251 | */ | 251 | */ |
252 | static int __init uncached_build_memmap(unsigned long uc_start, | 252 | static int __init uncached_build_memmap(u64 uc_start, u64 uc_end, void *arg) |
253 | unsigned long uc_end, void *arg) | ||
254 | { | 253 | { |
255 | int nid = paddr_to_nid(uc_start - __IA64_UNCACHED_OFFSET); | 254 | int nid = paddr_to_nid(uc_start - __IA64_UNCACHED_OFFSET); |
256 | struct gen_pool *pool = uncached_pools[nid].pool; | 255 | struct gen_pool *pool = uncached_pools[nid].pool; |