From patchwork Tue Dec 18 17:13:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 154169 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3962886ljp; Tue, 18 Dec 2018 09:15:27 -0800 (PST) X-Google-Smtp-Source: AFSGD/WkTa32c7Hlh1CUMwQUzDta7dOGr7exAPgxBbiFIBSpDSQYLhAyjCnlVVYhKJdOMBYjpYJ7 X-Received: by 2002:a63:9809:: with SMTP id q9mr3573292pgd.109.1545153327261; Tue, 18 Dec 2018 09:15:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545153327; cv=none; d=google.com; s=arc-20160816; b=qQ/G4RYalvAW+oZseXIF4UtfORB91+m4BfN1+kXCFvXMEIo5G21vdzWwQs2LnJ3isk rsAl0S2pRUcXVu+g2tOHDABTg/jVOJUYNyjVj5SMgKD8QzeyeGnYXx6Fw3taONBqUDgT ftcXehBQJrq+TZqYC/VbSwqaUXW8CRQsj+rB/euYn8QLsAxED8lqkGLv+XZu6RASIhsb L1AKE5AJM4SbtzezaVAuynBYaEWmXX0I+G11GrlEO+Sk87dkXmR3uwUuKuDaXw6v6nLc /a/D2xu8Ptw0dpVH1Y9LNH2lcxKpClxXTYXYriJtQHvRAHRznOdDlbIS7/G6zgMXFJA2 fp1w== 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; bh=AhTwfdoHF1ojlRkgqFVnXGpKzBsFHPpe0l92ek7SPsM=; b=N2oriWGZinA36jBT9Ph2IbVXHbztEmCZz71N8NmmVTM12woUsTh0wWgI7IVdeDVJcm ohDe9r/OrAie2apAhOIuOY9lIX16rDy5vJMXuVYzhFLSwFDiyA58YO5JGFetJogEgyu0 LVVnAAjsWpkuGK71c/x64HBhsgePEfPFGH2VdlH5PP3QDy+qMoVVEjlXJFV/YEYLFsHs NNjTD/trkAjtcVKN1T4G426i7pq8s1wHhw9wmaz/OKzA+E68JPKUThoUxQk5AwR0NXkj xfa3x2L9zOls2Q/XUIEHmvyGxTR4/BydRox0cwGP5mzWscwzfgODRnoy/1Zbgtohatm0 XyHg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k69si14181034pga.176.2018.12.18.09.15.27; Tue, 18 Dec 2018 09:15:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727145AbeLRROX (ORCPT + 15 others); Tue, 18 Dec 2018 12:14:23 -0500 Received: from Galois.linutronix.de ([146.0.238.70]:56639 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727322AbeLRROW (ORCPT ); Tue, 18 Dec 2018 12:14:22 -0500 Received: from localhost ([127.0.0.1] helo=bazinga.breakpoint.cc) by Galois.linutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1gZIwk-0006QU-46; Tue, 18 Dec 2018 18:14:18 +0100 From: Sebastian Andrzej Siewior To: stable@vger.kernel.org Cc: Peter Zijlstra , Will Deacon , Thomas Gleixner , Daniel Wagner , bigeasy@linutronix.de, Waiman Long , Linus Torvalds , boqun.feng@gmail.com, linux-arm-kernel@lists.infradead.org, paulmck@linux.vnet.ibm.com, Ingo Molnar Subject: [PATCH STABLE v4.14 06/10] locking/qspinlock: Remove duplicate clear_pending() function from PV code Date: Tue, 18 Dec 2018 18:13:56 +0100 Message-Id: <20181218171400.22711-7-bigeasy@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181218171400.22711-1-bigeasy@linutronix.de> References: <20181218171400.22711-1-bigeasy@linutronix.de> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Will Deacon commit 3bea9adc96842b8a7345c7fb202c16ae9c8d5b25 upstream. The native clear_pending() function is identical to the PV version, so the latter can simply be removed. This fixes the build for systems with >= 16K CPUs using the PV lock implementation. Reported-by: Waiman Long Signed-off-by: Will Deacon Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: boqun.feng@gmail.com Cc: linux-arm-kernel@lists.infradead.org Cc: paulmck@linux.vnet.ibm.com Link: http://lkml.kernel.org/r/20180427101619.GB21705@arm.com Signed-off-by: Ingo Molnar Signed-off-by: Sebastian Andrzej Siewior --- kernel/locking/qspinlock_paravirt.h | 5 ----- 1 file changed, 5 deletions(-) -- 2.20.1 diff --git a/kernel/locking/qspinlock_paravirt.h b/kernel/locking/qspinlock_paravirt.h index 854443f7b60b6..1e882dfc8b797 100644 --- a/kernel/locking/qspinlock_paravirt.h +++ b/kernel/locking/qspinlock_paravirt.h @@ -106,11 +106,6 @@ static __always_inline void set_pending(struct qspinlock *lock) atomic_or(_Q_PENDING_VAL, &lock->val); } -static __always_inline void clear_pending(struct qspinlock *lock) -{ - atomic_andnot(_Q_PENDING_VAL, &lock->val); -} - static __always_inline int trylock_clear_pending(struct qspinlock *lock) { int val = atomic_read(&lock->val);