From patchwork Tue Jun 19 12:53:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 139112 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5170745lji; Tue, 19 Jun 2018 05:53:28 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLfcBy+eCf/7JEfTKb0vCj5f46luemw1IUtq1cAZjKAeGjuMMVbG7SKJqsJtZIrwSYJQPzd X-Received: by 2002:a17:902:622:: with SMTP id 31-v6mr18631937plg.135.1529412808485; Tue, 19 Jun 2018 05:53:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529412808; cv=none; d=google.com; s=arc-20160816; b=BlUUdVOeKzcS74gUH/sAFONm0kDvTN0ss2lmmV2dvqac1G3JK/wjDu/7W1DEBo+q5p tTYJ59IoCpfteGC3GnFTc2GXTQlKIpobT/RApmu+4TkwLR3O07aiVEX/TE/oy+d9lvRp 2seriB1IlCmjnEcPtaldq8PUFd1QWFESpwg8de5ZUgpG+HYMNQbNUvU9FKAv/fvFq4s4 dzQcUz4sffKWH4jN9W0brkMAJnq5SZIU9YWh4UHZdBRxIMnnzdBWMFOtgXjCrviC3Svw tEMt6bLNYU23fO96PdKGK5nLFwM3BwN1AmtO7L+6M9yJqaDLmebb0KysjUnmn/fLdra8 EiqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=k+s9Vf+IyzX9x6W5RPMjrhsY0/5nokEG/V7DA5yUK3k=; b=CWsHRD+N1k7Pt/rsVxiMGYNChFX7p7kdQ/Pe5uMYbCS1NckzlLJDtkl3NeBqxQSceB hU1ia50rxNcDnaW4qWtKc2xHzWiLFdClf1hR2ji84xWpNwrws2Mo6hkKei/32JkWuoMJ m1SHe1hyYehPVTKzxRfpSHslFZZnXR8BVQpJDVanufdEjoZtOzL56X4xBqYdwlagDvrE QD/tU5AUndleH12VTmrWszfpEHXTJ1lcbCeyAof3tta+fCKgDFX4NvctxD6k2XUk/y+L zuqkGTtqDS1bc/zvHRO7y7NXuhqZPptuw2ZrUoi5orHSxrZDTjQla7FoNphU5uVrxG0J yd/A== 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 j13-v6si14169186pgc.288.2018.06.19.05.53.28; Tue, 19 Jun 2018 05:53:28 -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 S937888AbeFSMwo (ORCPT + 30 others); Tue, 19 Jun 2018 08:52:44 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:49296 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S937847AbeFSMwk (ORCPT ); Tue, 19 Jun 2018 08:52:40 -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 290291596; Tue, 19 Jun 2018 05:52:40 -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 EF46C3F59C; Tue, 19 Jun 2018 05:52:39 -0700 (PDT) Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id 854261AE0F4E; Tue, 19 Jun 2018 13:53:15 +0100 (BST) From: Will Deacon To: linux-kernel@vger.kernel.org Cc: peterz@infradead.org, mingo@kernel.org, linux-arm-kernel@lists.infradead.org, yamada.masahiro@socionext.com, Will Deacon , Yoshinori Sato Subject: [RESEND PATCH v2 1/9] h8300: Don't include linux/kernel.h in asm/atomic.h Date: Tue, 19 Jun 2018 13:53:06 +0100 Message-Id: <1529412794-17720-2-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1529412794-17720-1-git-send-email-will.deacon@arm.com> References: <1529412794-17720-1-git-send-email-will.deacon@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org linux/kernel.h isn't needed by asm/atomic.h and will result in circular dependencies when the asm-generic atomic bitops are built around the tomic_long_t interface. Remove the broad include and replace it with linux/compiler.h for READ_ONCE() etc and asm/irqflags.h for arch_local_irq_save() etc. Cc: Yoshinori Sato Acked-by: Peter Zijlstra (Intel) Signed-off-by: Will Deacon --- arch/h8300/include/asm/atomic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.1.4 diff --git a/arch/h8300/include/asm/atomic.h b/arch/h8300/include/asm/atomic.h index 941e7554e886..b174dec099bf 100644 --- a/arch/h8300/include/asm/atomic.h +++ b/arch/h8300/include/asm/atomic.h @@ -2,8 +2,10 @@ #ifndef __ARCH_H8300_ATOMIC__ #define __ARCH_H8300_ATOMIC__ +#include #include #include +#include /* * Atomic operations that C can't guarantee us. Useful for @@ -15,8 +17,6 @@ #define atomic_read(v) READ_ONCE((v)->counter) #define atomic_set(v, i) WRITE_ONCE(((v)->counter), (i)) -#include - #define ATOMIC_OP_RETURN(op, c_op) \ static inline int atomic_##op##_return(int i, atomic_t *v) \ { \