From patchwork Mon Feb 1 15:24:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sebastien dugue X-Patchwork-Id: 76101 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o11FQBA8017092 for ; Mon, 1 Feb 2010 15:26:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755039Ab0BAPZj (ORCPT ); Mon, 1 Feb 2010 10:25:39 -0500 Received: from ecfrec.frec.bull.fr ([129.183.4.8]:38929 "EHLO ecfrec.frec.bull.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754970Ab0BAPZi (ORCPT ); Mon, 1 Feb 2010 10:25:38 -0500 Received: from cyclope.frec.bull.fr (cyclope.frec.bull.fr [129.183.4.9]) by ecfrec.frec.bull.fr (Postfix) with ESMTP id 2D58B73083; Mon, 1 Feb 2010 16:25:30 +0100 (CET) Received: from frecb007965 (frecb007965.frec.bull.fr [129.183.101.36]) by cyclope.frec.bull.fr (Postfix) with ESMTP id 600782728D; Mon, 1 Feb 2010 16:25:26 +0100 (CET) Date: Mon, 1 Feb 2010 16:24:19 +0100 From: sebastien dugue To: linux-rdma Cc: Roland Dreier , Sean Hefty Subject: [PATCH] Fix 2.6.3[12] user_mad backports Message-ID: <20100201162419.443afe03@frecb007965> Organization: BULL X-Mailer: Claws Mail 3.5.0 (GTK+ 2.12.12; i486-pc-linux-gnu) Mime-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 01 Feb 2010 15:26:12 +0000 (UTC) diff --git a/kernel_patches/backport/2.6.31/user_mad_mutex_init.patch b/kernel_patches/backport/2.6.31/user_mad_mutex_init.patch index 09cb6e6..3054f1e 100644 --- a/kernel_patches/backport/2.6.31/user_mad_mutex_init.patch +++ b/kernel_patches/backport/2.6.31/user_mad_mutex_init.patch @@ -1,15 +1,15 @@ -From: Sven-Thorsten Dietrich -Subject: use updated mutex_init. - -Signed-off-by: Sven-Thorsten Dietrich ---- a/drivers/infiniband/core/user_mad.c 2009-11-24 07:52:27.000000000 -0800 -+++ b/drivers/infiniband/core//user_mad.c 2012-09-01 13:06:26.000000000 -0700 -@@ -1003,7 +1003,7 @@ - - port->ib_dev = device; - port->port_num = port_num; -- init_MUTEX(&port->sm_sem); -+ mutex_init(&port->sm_sem); - mutex_init(&port->file_mutex); - INIT_LIST_HEAD(&port->file_list); - +From: Sven-Thorsten Dietrich +Subject: use updated mutex_init. + +Signed-off-by: Sven-Thorsten Dietrich +--- a/drivers/infiniband/core/user_mad.c 2009-11-24 07:52:27.000000000 -0800 ++++ b/drivers/infiniband/core//user_mad.c 2012-09-01 13:06:26.000000000 -0700 +@@ -1003,7 +1003,7 @@ + + port->ib_dev = device; + port->port_num = port_num; +- init_MUTEX(&port->sm_sem); ++ sema_init(&port->sm_sem, 1); + mutex_init(&port->file_mutex); + INIT_LIST_HEAD(&port->file_list); + diff --git a/kernel_patches/backport/2.6.32/user_mad_mutex_init.patch b/kernel_patches/backport/2.6.32/user_mad_mutex_init.patch index 09cb6e6..3054f1e 100644 --- a/kernel_patches/backport/2.6.32/user_mad_mutex_init.patch +++ b/kernel_patches/backport/2.6.32/user_mad_mutex_init.patch @@ -1,15 +1,15 @@ -From: Sven-Thorsten Dietrich -Subject: use updated mutex_init. - -Signed-off-by: Sven-Thorsten Dietrich ---- a/drivers/infiniband/core/user_mad.c 2009-11-24 07:52:27.000000000 -0800 -+++ b/drivers/infiniband/core//user_mad.c 2012-09-01 13:06:26.000000000 -0700 -@@ -1003,7 +1003,7 @@ - - port->ib_dev = device; - port->port_num = port_num; -- init_MUTEX(&port->sm_sem); -+ mutex_init(&port->sm_sem); - mutex_init(&port->file_mutex); - INIT_LIST_HEAD(&port->file_list); - +From: Sven-Thorsten Dietrich +Subject: use updated mutex_init. + +Signed-off-by: Sven-Thorsten Dietrich +--- a/drivers/infiniband/core/user_mad.c 2009-11-24 07:52:27.000000000 -0800 ++++ b/drivers/infiniband/core//user_mad.c 2012-09-01 13:06:26.000000000 -0700 +@@ -1003,7 +1003,7 @@ + + port->ib_dev = device; + port->port_num = port_num; +- init_MUTEX(&port->sm_sem); ++ sema_init(&port->sm_sem, 1); + mutex_init(&port->file_mutex); + INIT_LIST_HEAD(&port->file_list); +