diff options
author | Tony Luck <tony.luck@intel.com> | 2009-06-17 18:35:24 +0200 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2009-06-17 18:35:24 +0200 |
commit | 27f70c3117194f98beb009dc48bb2aa267f505bf (patch) | |
tree | 22afa3fb31376da9e37f09a78745afe3f16fde8a /arch/ia64/kernel/uncached.c | |
parent | [IA64] Fix build error in paravirt_patchlist.c (diff) | |
parent | [IA64] Convert ia64 to use int-ll64.h (diff) | |
download | linux-27f70c3117194f98beb009dc48bb2aa267f505bf.tar.xz linux-27f70c3117194f98beb009dc48bb2aa267f505bf.zip |
Pull for-2.6.31 into release
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 6ba72ab42fcc..a595823582d9 100644 --- a/arch/ia64/kernel/uncached.c +++ b/arch/ia64/kernel/uncached.c @@ -250,8 +250,7 @@ EXPORT_SYMBOL(uncached_free_page); * Called at boot time to build a map of pages that can be used for * memory special operations. */ -static int __init uncached_build_memmap(unsigned long uc_start, - unsigned long uc_end, void *arg) +static int __init uncached_build_memmap(u64 uc_start, u64 uc_end, void *arg) { int nid = paddr_to_nid(uc_start - __IA64_UNCACHED_OFFSET); struct gen_pool *pool = uncached_pools[nid].pool; |