Currently, the UV xpc code is passing nid to the gru_create_message_queue instead of nasid as it expects. To: Andrew Morton Signed-off-by: Robin Holt Signed-off-by: Jack Steiner Cc: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org --- drivers/misc/sgi-xp/xpc_uv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Index: pv1000000/drivers/misc/sgi-xp/xpc_uv.c =================================================================== --- pv1000000.orig/drivers/misc/sgi-xp/xpc_uv.c 2009-12-02 16:51:40.000000000 -0600 +++ pv1000000/drivers/misc/sgi-xp/xpc_uv.c 2009-12-02 16:58:31.000000000 -0600 @@ -206,6 +206,7 @@ xpc_create_gru_mq_uv(unsigned int mq_siz enum xp_retval xp_ret; int ret; int nid; + int nasid; int pg_order; struct page *page; struct xpc_gru_mq_uv *mq; @@ -261,9 +262,11 @@ xpc_create_gru_mq_uv(unsigned int mq_siz 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); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/