Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57e6d258 authored by Robin Holt's avatar Robin Holt Committed by Linus Torvalds
Browse files

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: default avatarRobin Holt <holt@sgi.com>
Signed-off-by: default avatarJack Steiner <steiner@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 046d6c56

drivers/misc/sgi-xp/xpc_uv.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -207,6 +207,7 @@ xpc_create_gru_mq_uv(unsigned int mq_size, int cpu, char *irq_name, 
	enum xp_retval xp_ret;

	enum xp_retval xp_ret;

	int ret;

	int ret;

	int nid;

	int nid;

	int nasid;

	int pg_order;

	int pg_order;

	struct page *page;

	struct page *page;

	struct xpc_gru_mq_uv *mq;

	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;

		goto out_5;

	}

	}





	nasid = UV_PNODE_TO_NASID(uv_cpu_to_pnode(cpu));



	mmr_value = (struct uv_IO_APIC_route_entry *)&mq->mmr_value;

	mmr_value = (struct uv_IO_APIC_route_entry *)&mq->mmr_value;

	ret = gru_create_message_queue(mq->gru_mq_desc, mq->address, mq_size,

	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) {

	if (ret != 0) {

		dev_err(xpc_part, "gru_create_message_queue() returned "

		dev_err(xpc_part, "gru_create_message_queue() returned "

			"error=%d\n", ret);

			"error=%d\n", ret);