From patchwork Wed Oct 18 11:51:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 116278 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp5968276qgn; Wed, 18 Oct 2017 04:51:10 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCpz567SjHGDUSxt2z1ELlX18Rk30WuPtkxs9i0ossG8FxyuFyulldcRpe6oG2GlAcvqBtw X-Received: by 10.98.10.21 with SMTP id s21mr14742847pfi.119.1508327470122; Wed, 18 Oct 2017 04:51:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508327470; cv=none; d=google.com; s=arc-20160816; b=rIvRVGbKucqSkqnYGsfupqTaqTpdMM5se1C+Cykr5ys8TwC43T8ZiX/7M5Mg2R1l1V SHzi/vw9EV8ePaOqYObZuFOCRwQCOFGHXnEtogD0PN2o1ub31VoswZqT/4cpXXCN1QD3 LkRaBrFqJpL/j7K5hcddFTJf/2wtQHBXY9H3OuRUp1PhoGNBCYVtHytZia2ZvzH2ko+t GjKGHwUwScLpWzwvkrm0YHqF/Tvddxa0zMb4c9roMsVYDRjwjV41Mr6SM7oOjjEtqZGd EBZ3RFCZ8YM86FLtrvcBm3pGN4RixiApBjdVrWzaAwdc+RdJcfQhuPPIfQMfWVWOK8eq 8j5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=x38IQx9j6q2/f6Lba3qSz6h3hIJb5J3RNQ9xfktBRWk=; b=pNcX4MuaMJ/gCVao1v75HR6LsNw7818quNlbK2NpeXq4XxxNNR1HIbiXIlbNZd/uAL uI4+nVkFlEOC1OPKg8fLgvMq1f/XkMQEGBOKY8nmr8bWnlj9WlynXX+nQ9LlFdAZ1cdc It1XgwND6nHaP/Fwfl8Ds7ZR0/DYvQngdSKLi60txj2lElVhukKqEoejGk1228awP9VO MOjTBYriN2X16jkwHNn0sOKcgS/sDhUDDdk/wxleTkRo0lZuDaYpUEU/tz5dCFjkJEWX vb7K4gb+ywju2PK/n+HxE+0qvVgWfJhJ66wF8r2Hsi63IQG8wbpv0XBpozp5DFZ1cBjV QpKQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 3si6266084pli.734.2017.10.18.04.51.09; Wed, 18 Oct 2017 04:51:10 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756173AbdJRLvI (ORCPT + 27 others); Wed, 18 Oct 2017 07:51:08 -0400 Received: from foss.arm.com ([217.140.101.70]:38836 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756117AbdJRLvF (ORCPT ); Wed, 18 Oct 2017 07:51:05 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D1A9C1596; Wed, 18 Oct 2017 04:51:04 -0700 (PDT) Received: from edgewater-inn.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id A39E73F25D; Wed, 18 Oct 2017 04:51:04 -0700 (PDT) Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id 4F7821AE2DB3; Wed, 18 Oct 2017 12:51:10 +0100 (BST) From: Will Deacon To: mingo@kernel.org Cc: linux-kernel@vger.kernel.org, Will Deacon , Peter Zijlstra Subject: [PATCH] powerpc/rtas: Use arch_spin_lock instead of arch_spin_lock_flags Date: Wed, 18 Oct 2017 12:51:09 +0100 Message-Id: <1508327469-20231-1-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 2.1.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org arch_spin_lock_flags is an internal part of the spinlock implementation and is no longer available when SMP=n and DEBUG_SPINLOCK=y, so the PPC RTAS code fails to compile in this configuration: arch/powerpc/kernel/rtas.c: In function 'lock_rtas': >> arch/powerpc/kernel/rtas.c:81:2: error: implicit declaration of function 'arch_spin_lock_flags' [-Werror=implicit-function-declaration] arch_spin_lock_flags(&rtas.lock, flags); ^~~~~~~~~~~~~~~~~~~~ Since there's no good reason to use arch_spin_lock_flags here (the code in question already calls local_irq_save(flags)), switch it over to arch_spin_lock and get things building again. Cc: Peter Zijlstra Reported-by: kbuild test robot Signed-off-by: Will Deacon --- This patch fixes build breakage in -next via the -tip tree. arch/powerpc/kernel/rtas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.1.4 diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index 1643e9e53655..3f1c4fcbe0aa 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c @@ -78,7 +78,7 @@ static unsigned long lock_rtas(void) local_irq_save(flags); preempt_disable(); - arch_spin_lock_flags(&rtas.lock, flags); + arch_spin_lock(&rtas.lock); return flags; }