diff options
Diffstat (limited to 'arch/ia64/kernel/uncached.c')
-rw-r--r-- | arch/ia64/kernel/uncached.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/kernel/uncached.c b/arch/ia64/kernel/uncached.c index 8eff8c1d40a6..a595823582d9 100644 --- a/arch/ia64/kernel/uncached.c +++ b/arch/ia64/kernel/uncached.c | |||
@@ -98,7 +98,8 @@ static int uncached_add_chunk(struct uncached_pool *uc_pool, int nid) | |||
98 | 98 | ||
99 | /* attempt to allocate a granule's worth of cached memory pages */ | 99 | /* attempt to allocate a granule's worth of cached memory pages */ |
100 | 100 | ||
101 | page = alloc_pages_node(nid, GFP_KERNEL | __GFP_ZERO | GFP_THISNODE, | 101 | page = alloc_pages_exact_node(nid, |
102 | GFP_KERNEL | __GFP_ZERO | GFP_THISNODE, | ||
102 | IA64_GRANULE_SHIFT-PAGE_SHIFT); | 103 | IA64_GRANULE_SHIFT-PAGE_SHIFT); |
103 | if (!page) { | 104 | if (!page) { |
104 | mutex_unlock(&uc_pool->add_chunk_mutex); | 105 | mutex_unlock(&uc_pool->add_chunk_mutex); |
@@ -249,8 +250,7 @@ EXPORT_SYMBOL(uncached_free_page); | |||
249 | * Called at boot time to build a map of pages that can be used for | 250 | * Called at boot time to build a map of pages that can be used for |
250 | * memory special operations. | 251 | * memory special operations. |
251 | */ | 252 | */ |
252 | static int __init uncached_build_memmap(unsigned long uc_start, | 253 | static int __init uncached_build_memmap(u64 uc_start, u64 uc_end, void *arg) |
253 | unsigned long uc_end, void *arg) | ||
254 | { | 254 | { |
255 | int nid = paddr_to_nid(uc_start - __IA64_UNCACHED_OFFSET); | 255 | int nid = paddr_to_nid(uc_start - __IA64_UNCACHED_OFFSET); |
256 | struct gen_pool *pool = uncached_pools[nid].pool; | 256 | struct gen_pool *pool = uncached_pools[nid].pool; |