Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp408662yba; Wed, 24 Apr 2019 03:27:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqwXRP5EiSe1mSvzJw9fGNS5QGHv3xVzm1e5GU0+45gujE78rIYfiV46YNR5bINtLmAwfjM5 X-Received: by 2002:a17:902:be09:: with SMTP id r9mr31947845pls.215.1556101670649; Wed, 24 Apr 2019 03:27:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556101670; cv=none; d=google.com; s=arc-20160816; b=xyMGEGjhm69Uo630eBT8eaKnYoHPYsFqgE411DO0loZqyGxuCOqkqncGLVnkrXa4Pn qjlRvZaiBWaqhJmMKvPK2vu9FZSVflUmKxdALlbvhim9QiDdI5X9WqNDwVgMYrXrCbnz n6PG5fu+ublKao6QR3K6kJdWZszqLnCd8HUOQL1Op0urEu7iJIn4Yy6+UAJe3iiLPAhw Pr8Cn74dd+K6m/uMjPes/Wvwn/Marv+Uw4QplF1s+jiippO+hMKV9vyBFB12d7WndCEP nYaWStrNGiuoG0yx2UtF1J9qB/3fsup4moT0Xb0t0vSHF4UExLZk9lE+/BZqxP2kUkBM lQZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6HDIg6ROZRC2jfQ3nCG9gUelBX+LREsHvgd1/Lztul0=; b=gzQG20TyFNUyhYCd/lh3SX8lsEfueS26Eez/+mDn0JhnsgJ/rwqWEHkgR03LWacZBo WSUEvQ9761wTtqIE/2f5d6J58+ZFiGmbhGxwImn0L/ZfgGhgu+vXOr37Hu5gfdFqwiTG GmFigQYi8CZ6arMsBER6NgRiB6lk1JcczUx44WCLeDVnrJ2IPwFhBg5si710+iU83a8X DpCXuVFub1bZ2zftkQJLVW7VI+/SHmPkWCovLycL+Q2cuyAU6DWGXRbBpiZG5xRhOz6s jtHwD1V7Xr25P6pyCvT7/sHf8/Yd5Z6HTBE6DUXelfkiMtSB69V9xjjpqrAu3z4xuN4R dGkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="i4/rFMz4"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x2si17373506pgh.231.2019.04.24.03.27.35; Wed, 24 Apr 2019 03:27:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="i4/rFMz4"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729690AbfDXKWb (ORCPT + 99 others); Wed, 24 Apr 2019 06:22:31 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:42943 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729652AbfDXKVX (ORCPT ); Wed, 24 Apr 2019 06:21:23 -0400 Received: by mail-pl1-f195.google.com with SMTP id x15so4712717pln.9 for ; Wed, 24 Apr 2019 03:21:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6HDIg6ROZRC2jfQ3nCG9gUelBX+LREsHvgd1/Lztul0=; b=i4/rFMz4p1i8vXbatI/palG8YptRmoo1LHUDBGR8Ay5DruCATulff09VlWu5Tosmlr UtntX8RYUw7NTBXwxNXRYFlJKPwcYBd6vqqMuleUFcbXJiHq09XaMf204+r0Mkewexgc i2VnnVBfDEVIjW1oCSUE74vbrD7D8yol2BamSkMNUdzwqLHN2D7FnDHdiEsxPqkCRme3 Lw87IGgzwK6AvnTSc62V8CA7poN+cNjOaYYluOxemK2MO9zoK37PP+so4qDQX+ay5oAV AzaDIqDR8K4PbcBCDPIw1MtPRb8WYsAK5zCcdlrcDIVccLqlnFlyvb5ZAZSnKPl8WNh4 nL/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6HDIg6ROZRC2jfQ3nCG9gUelBX+LREsHvgd1/Lztul0=; b=GhbxFv2X8gfpkzmhoT1cUsZEEzThAmjgA/yZOJPFN+9Uq+hfr4YF5yvtEpr0bprBqy ESPJqaT30cs9bEd8FWUmMgR6/Dgt3IKvSCTV0ZktKcedHEs6BBNmF/n1oyBANHVRGKjm Ob/nYo+evofhSOUBHztFeXZLsioNgHfbQ3G+aV2362lQuwMC+AYfsGPiN59WbAogqUdZ /7YU1hKyXru2HUtcm9Jw4/tOAK/wr5FXQlAseuhSISMimSFpMC+uYgHHgeMbXydgQRxC w7AQFpVl2fGAJ51lTHQqKWxVn61nKjOnXBaMNB0/6AU5GHpWoM6NRE/TLOfp29fxwiYx TRZw== X-Gm-Message-State: APjAAAVzaXFlPkTiES8tbTa1ERzDdqMZ1c66cY7FTvbo7hX0tdsYfeFy MXK3bUYBmgGneUaWXZGQO0Q= X-Received: by 2002:a17:902:121:: with SMTP id 30mr30487952plb.174.1556101282880; Wed, 24 Apr 2019 03:21:22 -0700 (PDT) Received: from localhost.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id v19sm25051604pfn.62.2019.04.24.03.21.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Apr 2019 03:21:22 -0700 (PDT) From: Yuyang Du To: peterz@infradead.org, will.deacon@arm.com, mingo@kernel.org Cc: bvanassche@acm.org, ming.lei@redhat.com, frederic@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, Yuyang Du Subject: [PATCH 18/28] locking/lockdep: Remove unused argument in __lock_release Date: Wed, 24 Apr 2019 18:19:24 +0800 Message-Id: <20190424101934.51535-19-duyuyang@gmail.com> X-Mailer: git-send-email 2.20.1 (Apple Git-117) In-Reply-To: <20190424101934.51535-1-duyuyang@gmail.com> References: <20190424101934.51535-1-duyuyang@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The @nested is not used in __release_lock so remove it despite that it is not used in lock_release in the first place. Signed-off-by: Yuyang Du --- kernel/locking/lockdep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index eb85183..6e79bd6 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -3988,7 +3988,7 @@ static int __lock_downgrade(struct lockdep_map *lock, unsigned long ip) * @nested is an hysterical artifact, needs a tree wide cleanup. */ static int -__lock_release(struct lockdep_map *lock, int nested, unsigned long ip) +__lock_release(struct lockdep_map *lock, unsigned long ip) { struct task_struct *curr = current; struct held_lock *hlock; @@ -4276,7 +4276,7 @@ void lock_release(struct lockdep_map *lock, int nested, check_flags(flags); current->lockdep_recursion = 1; trace_lock_release(lock, ip); - if (__lock_release(lock, nested, ip)) + if (__lock_release(lock, ip)) check_chain_key(current); current->lockdep_recursion = 0; raw_local_irq_restore(flags); -- 1.8.3.1