From 1461655d25ead987b99353c31f86ffe26e39b74b Mon Sep 17 00:00:00 2001 From: David Howells Date: Mon, 5 Feb 2007 16:21:08 -0800 Subject: [PATCH] --- yaml --- r: 48295 b: refs/heads/master c: 6bdd61d876e6eacea5c59230b6b2d988b22793e6 h: refs/heads/master i: 48293: c882dbfa007639a29c602397349e2868f985943a 48291: f1214274a6d3d8d0064c1ccca5248c324974ded5 48287: 765eda7c7a3ae26e79556265e30b9b30cca4b8d8 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/mthca/mthca_srq.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b5c55717e8b3..da754ff1e00e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 839fcaba355abaffb7b44f0f4504093acb0b11cf +refs/heads/master: 6bdd61d876e6eacea5c59230b6b2d988b22793e6 diff --git a/trunk/drivers/infiniband/hw/mthca/mthca_srq.c b/trunk/drivers/infiniband/hw/mthca/mthca_srq.c index 10684da33d58..61974b0296ca 100644 --- a/trunk/drivers/infiniband/hw/mthca/mthca_srq.c +++ b/trunk/drivers/infiniband/hw/mthca/mthca_srq.c @@ -116,11 +116,16 @@ static void mthca_arbel_init_srq_context(struct mthca_dev *dev, struct mthca_srq *srq, struct mthca_arbel_srq_context *context) { - int logsize; + int logsize, max; memset(context, 0, sizeof *context); - logsize = ilog2(srq->max); + /* + * Put max in a temporary variable to work around gcc bug + * triggered by ilog2() on sparc64. + */ + max = srq->max; + logsize = ilog2(max); context->state_logsize_srqn = cpu_to_be32(logsize << 24 | srq->srqn); context->lkey = cpu_to_be32(srq->mr.ibmr.lkey); context->db_index = cpu_to_be32(srq->db_index);