Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 57e6d258b1e41cd7ceb26fa43ce116939d8440b1

Authored by Robin Holt
Committed by Linus Torvalds
1 parent 046d6c563b
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

UV - XPC: pass nasid instead of nid to gru_create_message_queue 

Currently, the UV xpc code is passing nid to the gru_create_message_queue
instead of nasid as it expects.

Signed-off-by: Robin Holt <holt@sgi.com>
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>

Showing 1 changed file with 4 additions and 1 deletions Side-by-side Diff

drivers/misc/sgi-xp/xpc_uv.c
Diff comments   View file @ 57e6d25
... ... @@ -207,6 +207,7 @@
207 207 enum xp_retval xp_ret;
208 208 int ret;
209 209 int nid;
  210 + int nasid;
210 211 int pg_order;
211 212 struct page *page;
212 213 struct xpc_gru_mq_uv *mq;
213 214  
... ... @@ -262,9 +263,11 @@
262 263 goto out_5;
263 264 }
264 265  
  266 + nasid = UV_PNODE_TO_NASID(uv_cpu_to_pnode(cpu));
  267 +
265 268 mmr_value = (struct uv_IO_APIC_route_entry *)&mq->mmr_value;
266 269 ret = gru_create_message_queue(mq->gru_mq_desc, mq->address, mq_size,
267   - nid, mmr_value->vector, mmr_value->dest);
  270 + nasid, mmr_value->vector, mmr_value->dest);
268 271 if (ret != 0) {
269 272 dev_err(xpc_part, "gru_create_message_queue() returned "
270 273 "error=%d\n", ret);