From patchwork Wed Jan 27 17:01:56 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Alexander Schmidt <alexs@linux.vnet.ibm.com>
X-Patchwork-Id: 75482
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0RH24IF026795
	for <patchwork-linux-rdma@patchwork.kernel.org>;
	Wed, 27 Jan 2010 17:02:04 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754150Ab0A0RCB (ORCPT
	<rfc822;patchwork-linux-rdma@patchwork.kernel.org>);
	Wed, 27 Jan 2010 12:02:01 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755620Ab0A0RCB
	(ORCPT <rfc822;linux-rdma-outgoing>);
	Wed, 27 Jan 2010 12:02:01 -0500
Received: from mtagate2.uk.ibm.com ([194.196.100.162]:37968 "EHLO
	mtagate2.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1754150Ab0A0RB7 (ORCPT
	<rfc822; linux-rdma@vger.kernel.org>); Wed, 27 Jan 2010 12:01:59 -0500
Received: from d06nrmr1407.portsmouth.uk.ibm.com
	(d06nrmr1407.portsmouth.uk.ibm.com [9.149.38.185])
	by mtagate2.uk.ibm.com (8.13.1/8.13.1) with ESMTP id o0RH1wOo002585;
	Wed, 27 Jan 2010 17:01:58 GMT
Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com
	[9.149.37.228])
	by d06nrmr1407.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with
	ESMTP id o0RH1wdN970952; Wed, 27 Jan 2010 17:01:58 GMT
Received: from d06av02.portsmouth.uk.ibm.com (loopback [127.0.0.1])
	by d06av02.portsmouth.uk.ibm.com (8.12.11.20060308/8.13.3) with ESMTP
	id o0RH1vNL030712; Wed, 27 Jan 2010 17:01:58 GMT
Received: from alex-laptop (dyn-9-152-241-138.boeblingen.de.ibm.com
	[9.152.241.138])
	by d06av02.portsmouth.uk.ibm.com (8.12.11.20060308/8.12.11) with
	ESMTP id o0RH1vci030686; Wed, 27 Jan 2010 17:01:57 GMT
Date: Wed, 27 Jan 2010 18:01:56 +0100
From: Alexander Schmidt <alexs@linux.vnet.ibm.com>
To: Roland Dreier <rdreier@cisco.com>,
	Linux RDMA <linux-rdma@vger.kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
	Stefan Roscher <stefan.roscher@de.ibm.com>,
	Joachim Fenkes <fenkes@de.ibm.com>, Christoph Raisch <raisch@de.ibm.com>,
	Hoang-Nam Nguyen <HNGUYEN@linux.vnet.ibm.com>,
	David Wilder <wilder@us.ibm.com>
Subject: [PATCH 1/2] ib/ehca: Do not turn off irqs in tasklet context
Message-ID: <20100127180156.795056a5@alex-laptop>
In-Reply-To: <20100127180035.779b24d1@alex-laptop>
References: <20100127180035.779b24d1@alex-laptop>
X-Mailer: Claws Mail 3.6.1 (GTK+ 2.16.1; i486-pc-linux-gnu)
Mime-Version: 1.0
Sender: linux-rdma-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-rdma.vger.kernel.org>
X-Mailing-List: linux-rdma@vger.kernel.org


--- linux-2.6.orig/drivers/infiniband/hw/ehca/ehca_irq.c
+++ linux-2.6/drivers/infiniband/hw/ehca/ehca_irq.c
@@ -548,11 +548,10 @@ void ehca_process_eq(struct ehca_shca *s
 	struct ehca_eq *eq = &shca->eq;
 	struct ehca_eqe_cache_entry *eqe_cache = eq->eqe_cache;
 	u64 eqe_value, ret;
-	unsigned long flags;
 	int eqe_cnt, i;
 	int eq_empty = 0;
 
-	spin_lock_irqsave(&eq->irq_spinlock, flags);
+	spin_lock(&eq->irq_spinlock);
 	if (is_irq) {
 		const int max_query_cnt = 100;
 		int query_cnt = 0;
@@ -643,7 +642,7 @@ void ehca_process_eq(struct ehca_shca *s
 	} while (1);
 
 unlock_irq_spinlock:
-	spin_unlock_irqrestore(&eq->irq_spinlock, flags);
+	spin_unlock(&eq->irq_spinlock);
 }
 
 void ehca_tasklet_eq(unsigned long data)