From a7f222e32db90a01c23b96d0e647d6cd63f492c7 Mon Sep 17 00:00:00 2001 From: Jack Steiner Date: Tue, 15 Dec 2009 16:48:03 -0800 Subject: [PATCH] --- yaml --- r: 176725 b: refs/heads/master c: 9178052fda2f934535f0b9940b987c3ac4c51bd7 h: refs/heads/master i: 176723: 8d2b7737657e8b6a1b192b6342e4bb19280fb025 v: v3 --- [refs] | 2 +- trunk/drivers/misc/sgi-gru/grufile.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e4ab3c75645a..f24c979db3f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b61fc69bb61838e99b368d208e6e2ee363eba2a1 +refs/heads/master: 9178052fda2f934535f0b9940b987c3ac4c51bd7 diff --git a/trunk/drivers/misc/sgi-gru/grufile.c b/trunk/drivers/misc/sgi-gru/grufile.c index 6318ee5c8d50..2e574fd5d3f7 100644 --- a/trunk/drivers/misc/sgi-gru/grufile.c +++ b/trunk/drivers/misc/sgi-gru/grufile.c @@ -266,8 +266,8 @@ static int gru_init_tables(unsigned long gru_base_paddr, void *gru_base_vaddr) max_user_dsr_bytes = GRU_NUM_DSR_BYTES; for_each_possible_blade(bid) { pnode = uv_blade_to_pnode(bid); - nid = uv_blade_to_memory_nid(bid); - page = alloc_pages_exact_node(nid, GFP_KERNEL, order); + nid = uv_blade_to_memory_nid(bid);/* -1 if no memory on blade */ + page = alloc_pages_node(nid, GFP_KERNEL, order); if (!page) goto fail; gru_base[bid] = page_address(page);