diff options
| author | Jack Steiner <steiner@sgi.com> | 2009-12-15 16:48:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 07:20:14 -0800 |
| commit | 827f02febfcdfb03bc056bf479a13b5bcb35dfd7 (patch) | |
| tree | 770bab4d08009d7a1ab8b1dd8906d01af7414bf8 | |
| parent | 57e6d258b1e41cd7ceb26fa43ce116939d8440b1 (diff) | |
| download | talos-op-linux-827f02febfcdfb03bc056bf479a13b5bcb35dfd7.tar.gz talos-op-linux-827f02febfcdfb03bc056bf479a13b5bcb35dfd7.zip | |
gru: initial GRU based on blade topology
Change the GRU initialization code to initialize based on blade topology
instead of node topology. The result is the same but blade-based
initialization is cleaner.
Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/misc/sgi-gru/grufile.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c index ce5eda985ab0..6318ee5c8d50 100644 --- a/drivers/misc/sgi-gru/grufile.c +++ b/drivers/misc/sgi-gru/grufile.c @@ -264,11 +264,9 @@ static int gru_init_tables(unsigned long gru_base_paddr, void *gru_base_vaddr) max_user_cbrs = GRU_NUM_CB; max_user_dsr_bytes = GRU_NUM_DSR_BYTES; - for_each_online_node(nid) { - bid = uv_node_to_blade_id(nid); - pnode = uv_node_to_pnode(nid); - if (bid < 0 || gru_base[bid]) - continue; + 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); if (!page) goto fail; @@ -298,8 +296,8 @@ static int gru_init_tables(unsigned long gru_base_paddr, void *gru_base_vaddr) return 0; fail: - for (nid--; nid >= 0; nid--) - free_pages((unsigned long)gru_base[nid], order); + for (bid--; bid >= 0; bid--) + free_pages((unsigned long)gru_base[bid], order); return -ENOMEM; } |
