diff options
author | Robin Holt <holt@sgi.com> | 2009-12-15 19:48:00 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 10:20:14 -0500 |
commit | 57e6d258b1e41cd7ceb26fa43ce116939d8440b1 (patch) | |
tree | 2e2bdba3cb899dc0239259bb05bb09ebbf3a9739 /drivers/misc/sgi-xp | |
parent | 046d6c563b1c6226bbf0f84e5b2413ad8ab921a1 (diff) |
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>
Diffstat (limited to 'drivers/misc/sgi-xp')
-rw-r--r-- | drivers/misc/sgi-xp/xpc_uv.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/misc/sgi-xp/xpc_uv.c b/drivers/misc/sgi-xp/xpc_uv.c index d2f4e9121f93..8725d5e8ab0c 100644 --- a/drivers/misc/sgi-xp/xpc_uv.c +++ b/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, | |||
207 | enum xp_retval xp_ret; | 207 | enum xp_retval xp_ret; |
208 | int ret; | 208 | int ret; |
209 | int nid; | 209 | int nid; |
210 | int nasid; | ||
210 | int pg_order; | 211 | int pg_order; |
211 | struct page *page; | 212 | struct page *page; |
212 | struct xpc_gru_mq_uv *mq; | 213 | struct xpc_gru_mq_uv *mq; |
@@ -262,9 +263,11 @@ xpc_create_gru_mq_uv(unsigned int mq_size, int cpu, char *irq_name, | |||
262 | goto out_5; | 263 | goto out_5; |
263 | } | 264 | } |
264 | 265 | ||
266 | nasid = UV_PNODE_TO_NASID(uv_cpu_to_pnode(cpu)); | ||
267 | |||
265 | mmr_value = (struct uv_IO_APIC_route_entry *)&mq->mmr_value; | 268 | mmr_value = (struct uv_IO_APIC_route_entry *)&mq->mmr_value; |
266 | ret = gru_create_message_queue(mq->gru_mq_desc, mq->address, mq_size, | 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 | if (ret != 0) { | 271 | if (ret != 0) { |
269 | dev_err(xpc_part, "gru_create_message_queue() returned " | 272 | dev_err(xpc_part, "gru_create_message_queue() returned " |
270 | "error=%d\n", ret); | 273 | "error=%d\n", ret); |