From patchwork Thu May 8 23:07:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Goode X-Patchwork-Id: 347271 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A321A14009B for ; Fri, 9 May 2014 09:06:23 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755947AbaEHXGD (ORCPT ); Thu, 8 May 2014 19:06:03 -0400 Received: from mail-lb0-f171.google.com ([209.85.217.171]:61595 "EHLO mail-lb0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755389AbaEHXGB (ORCPT ); Thu, 8 May 2014 19:06:01 -0400 Received: by mail-lb0-f171.google.com with SMTP id 10so4619906lbg.30 for ; Thu, 08 May 2014 16:05:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=fHK1KD20hula94NH8GHhxOy6Pq9OoG1Q/LZn3pIfo8M=; b=kFr6PdbAIsR7KbrL3vhJHgw8HGmH0o3Cq0+DyOGbTUxuzaWKIYexaZ7wYZeXHaGy3P j+PxNsbM+6aeGX9JG3HyPxAHCjBLRIvCRirkdzUmeRbI9YuznntYu1450jKL93JPKqqU 9ckZA+oTQoDtPa+xXPibXYYRJgDABS45Y3x15g+bq84ZqF5JKusFWSSpEjM5iEdYpw8q c7culmnTXohbjEh+gYGHB54hq+XOo0Z+c+jlBT3ItREnGDgEezCXSFGIxngaunuh6f7L XJgWg9G62nXQtg6ZqgkLCJZkvZJjKc59ZQN1+UTRM82xJsLgZbMidwrRL4o/qjhqUKDs aNbg== X-Received: by 10.112.106.40 with SMTP id gr8mr7665771lbb.0.1399590359397; Thu, 08 May 2014 16:05:59 -0700 (PDT) Received: from localhost.localdomain (s83-179-48-77.cust.tele2.se. [83.179.48.77]) by mx.google.com with ESMTPSA id dl4sm2479363lbc.4.2014.05.08.16.05.57 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 May 2014 16:05:58 -0700 (PDT) From: Emil Goode To: "David S. Miller" , Jingoo Han , Jeff Kirsher , Ben Hutchings , Arend van Spriel , Joe Perches Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Emil Goode Subject: [PATCH] net: cassini: use nested lock annotation Date: Fri, 9 May 2014 01:07:17 +0200 Message-Id: <1399590437-5548-1-git-send-email-emilgoode@gmail.com> X-Mailer: git-send-email 1.7.10.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In the cas_lock_tx function we acquire multiple locks in a loop and need to use nested lock annotation to prevent lockdep warnings. Reported-by: Meelis Roos Signed-off-by: Emil Goode --- drivers/net/ethernet/sun/cassini.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c index df8d383..b9ac20f 100644 --- a/drivers/net/ethernet/sun/cassini.c +++ b/drivers/net/ethernet/sun/cassini.c @@ -246,7 +246,7 @@ static inline void cas_lock_tx(struct cas *cp) int i; for (i = 0; i < N_TX_RINGS; i++) - spin_lock(&cp->tx_lock[i]); + spin_lock_nested(&cp->tx_lock[i], i); } static inline void cas_lock_all(struct cas *cp)