From 46399796fa07bd5b6262a587272d8a7d17bf2f9d Mon Sep 17 00:00:00 2001 From: Robin Holt Date: Tue, 15 Dec 2009 16:48:00 -0800 Subject: [PATCH] --- yaml --- r: 176721 b: refs/heads/master c: 57e6d258b1e41cd7ceb26fa43ce116939d8440b1 h: refs/heads/master i: 176719: 5946c5a13247006e7ec5e6c01ccb95d12ce44add v: v3 --- [refs] | 2 +- trunk/drivers/misc/sgi-xp/xpc_uv.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 72e10b7bdddd..8fe13d0dd887 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 046d6c563b1c6226bbf0f84e5b2413ad8ab921a1 +refs/heads/master: 57e6d258b1e41cd7ceb26fa43ce116939d8440b1 diff --git a/trunk/drivers/misc/sgi-xp/xpc_uv.c b/trunk/drivers/misc/sgi-xp/xpc_uv.c index d2f4e9121f93..8725d5e8ab0c 100644 --- a/trunk/drivers/misc/sgi-xp/xpc_uv.c +++ b/trunk/drivers/misc/sgi-xp/xpc_uv.c @@ -207,6 +207,7 @@ xpc_create_gru_mq_uv(unsigned int mq_size, int cpu, char *irq_name, enum xp_retval xp_ret; int ret; int nid; + int nasid; int pg_order; struct page *page; struct xpc_gru_mq_uv *mq; @@ -262,9 +263,11 @@ xpc_create_gru_mq_uv(unsigned int mq_size, int cpu, char *irq_name, goto out_5; } + nasid = UV_PNODE_TO_NASID(uv_cpu_to_pnode(cpu)); + mmr_value = (struct uv_IO_APIC_route_entry *)&mq->mmr_value; ret = gru_create_message_queue(mq->gru_mq_desc, mq->address, mq_size, - nid, mmr_value->vector, mmr_value->dest); + nasid, mmr_value->vector, mmr_value->dest); if (ret != 0) { dev_err(xpc_part, "gru_create_message_queue() returned " "error=%d\n", ret);