aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorDean Nelson <dcn@sgi.com>2008-04-25 16:22:19 -0400
committerTony Luck <tony.luck@intel.com>2008-04-29 16:49:01 -0400
commite4a064dfa2b242519a9f06f9a1e58c27bf0c371b (patch)
tree671214b5b256e4b397ce321346d58a551845fe68 /drivers/misc
parente617fce64e5faea149fcf3bffc1b42e4ba29e7e5 (diff)
[IA64] allocate multiple contiguous pages via uncached allocator
Enable the uncached allocator to allocate multiple pages of contiguous uncached memory. Signed-off-by: Dean Nelson <dcn@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/sgi-xp/xpc_partition.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/sgi-xp/xpc_partition.c b/drivers/misc/sgi-xp/xpc_partition.c
index 27e200ec5826..acd3fd4285d7 100644
--- a/drivers/misc/sgi-xp/xpc_partition.c
+++ b/drivers/misc/sgi-xp/xpc_partition.c
@@ -211,7 +211,7 @@ xpc_rsvd_page_init(void)
211 */ 211 */
212 amos_page = xpc_vars->amos_page; 212 amos_page = xpc_vars->amos_page;
213 if (amos_page == NULL) { 213 if (amos_page == NULL) {
214 amos_page = (AMO_t *)TO_AMO(uncached_alloc_page(0)); 214 amos_page = (AMO_t *)TO_AMO(uncached_alloc_page(0, 1));
215 if (amos_page == NULL) { 215 if (amos_page == NULL) {
216 dev_err(xpc_part, "can't allocate page of AMOs\n"); 216 dev_err(xpc_part, "can't allocate page of AMOs\n");
217 return NULL; 217 return NULL;
@@ -230,7 +230,7 @@ xpc_rsvd_page_init(void)
230 dev_err(xpc_part, "can't change memory " 230 dev_err(xpc_part, "can't change memory "
231 "protections\n"); 231 "protections\n");
232 uncached_free_page(__IA64_UNCACHED_OFFSET | 232 uncached_free_page(__IA64_UNCACHED_OFFSET |
233 TO_PHYS((u64)amos_page)); 233 TO_PHYS((u64)amos_page), 1);
234 return NULL; 234 return NULL;
235 } 235 }
236 } 236 }