[Patch 04/29] GRU - handle blades without memory

steiner
2009-11-24T15:13:22Z

[-- Attachment #1: uv_gru_table_alloc --]
[-- Type: text/plain, Size: 1053 bytes --]

From: Jack Steiner <steiner@sgi.com>

Do not use alloc_pages_exact_node() to allocate GRU tables. If
a blade has no local memory, nid will be -1. Use alloc_pages_node()
instead.

Signed-off-by: Jack Steiner <steiner@sgi.com>

---
drivers/misc/sgi-gru/grufile.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux/drivers/misc/sgi-gru/grufile.c
===================================================================
--- linux.orig/drivers/misc/sgi-gru/grufile.c 2009-11-20 09:32:26.000000000 -0600
+++ linux/drivers/misc/sgi-gru/grufile.c 2009-11-20 09:32:28.000000000 -0600
@@ -266,8 +266,8 @@ static int gru_init_tables(unsigned long
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);