mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-09 20:32:04 +09:00
UV - XPC: pass nasid instead of nid to gru_create_message_queue
commit 57e6d258b1 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
0bf178002c
commit
0bbe1f679d
@@ -203,6 +203,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;
|
||||
@@ -258,9 +259,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);
|
||||
|
||||
Reference in New Issue
Block a user