Message ID | 1519657500-15094-5-git-send-email-will.deacon@arm.com |
---|---|
State | Superseded |
Headers | show
Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp304799lja; Mon, 26 Feb 2018 07:09:42 -0800 (PST) X-Google-Smtp-Source: AG47ELv3cj5djxz0I91c3vi/cxwIdjnDbfG9cMb7CBDYu370Ju0+lKdTNWXfnM/nQr2SxtiO3lED X-Received: by 2002:a25:845:: with SMTP id 66-v6mr6953958ybi.433.1519657782476; Mon, 26 Feb 2018 07:09:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519657782; cv=none; d=google.com; s=arc-20160816; b=frOkxH9AG6Rqurfj70a6shE/di3wugqGufN4dy6oj6aWV8JcRgYzt5E+ztb6BV07Q9 F+A3s0n5yOvajsBtGDvC85SwTF5yXcvCeG9lxLmdhvlx7MEn1g0q2GD6Y4g+Zih+Flpl gLjYlce5AelMd3ZPFPTHRr2rKhkqn6d/5Ws5TX3MvSusZA+Vf3iB9xIMSIkON476KeDj GfNtjPAa1JZIZFyc4UkSQClY2AgaRktMEL7/20wVnpwdgRUVI9G4dK4aRTjZn4DIiAQK kUY8yAod7ODqdQcHi76rbG2twgjjglZf+zg4LtGLYkMZ19N94MVU+FZUA6Id0YKcq6vh fM+Q== 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=doLSP4mOf6xS/gyiyhtRPbsqcGmgXTwXMVQjWgrInXY=; b=m+XDIBtX74GlpbdplBBU5jN4mq1nsI9AavWCs8OHPK2aKHpkasWDKLcocVs16Xgdvx +tFl3cf0QSYQ0QNMiw5rCpGyip0EwIX89U3Sw5a3HV/M2LOYax0E4MbcZNl89pN+qIJx 3wtWF4BYpVVSicB0X7gf97LAtHnV+4snOGab5r6Q06DAQLlTOpSKb+BmFWwe8QFgl6Q+ g/Ci22lIIgYYkhlCDGQ3v+zUcca7vMYIvXFmmQqUCvQ8eOwFomf4OC/DRIb/BRCVP2uY cjPIDUe/dP9qwgP7DpTAQRr4T+gfhF//U9rh98k68scNzdZ4yBPCBcEnJWtUSG8bTLIJ qYJA== 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: <linux-kernel-owner@vger.kernel.org> Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d1-v6si1513397ybl.750.2018.02.26.07.09.42; Mon, 26 Feb 2018 07:09:42 -0800 (PST) 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 S1754209AbeBZPJd (ORCPT <rfc822; dan.rue@linaro.org> + 28 others); Mon, 26 Feb 2018 10:09:33 -0500 Received: from foss.arm.com ([217.140.101.70]:51170 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753952AbeBZPFA (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 26 Feb 2018 10:05:00 -0500 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 36FD1165C; Mon, 26 Feb 2018 07:05:00 -0800 (PST) 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 086533F59D; Mon, 26 Feb 2018 07:05:00 -0800 (PST) Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id 8B86E1AE53AC; Mon, 26 Feb 2018 15:05:01 +0000 (GMT) From: Will Deacon <will.deacon@arm.com> 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 <will.deacon@arm.com> Subject: [RFC PATCH v2 04/12] openrisc: Don't pull in all of linux/bitops.h in asm/cmpxchg.h Date: Mon, 26 Feb 2018 15:04:52 +0000 Message-Id: <1519657500-15094-5-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1519657500-15094-1-git-send-email-will.deacon@arm.com> References: <1519657500-15094-1-git-send-email-will.deacon@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org |
Series |
Rewrite asm-generic/bitops/{atomic,lock}.h and use on arm64
|
expand
|
diff --git a/arch/openrisc/include/asm/cmpxchg.h b/arch/openrisc/include/asm/cmpxchg.h index d29f7db53906..94b578388fe2 100644 --- a/arch/openrisc/include/asm/cmpxchg.h +++ b/arch/openrisc/include/asm/cmpxchg.h @@ -16,8 +16,9 @@ #ifndef __ASM_OPENRISC_CMPXCHG_H #define __ASM_OPENRISC_CMPXCHG_H +#include <linux/compiler.h> #include <linux/types.h> -#include <linux/bitops.h> +#include <asm-generic/bits.h> #define __HAVE_ARCH_CMPXCHG 1
The openrisc implementation of asm/cmpxchg.h pulls in linux/bitops.h so that it can refer to BITS_PER_BYTE. It also transitively relies on this pulling in linux/compiler.h for READ_ONCE. Replace the #include with asm-generic/bits.h and linux/compiler.h Signed-off-by: Will Deacon <will.deacon@arm.com> --- arch/openrisc/include/asm/cmpxchg.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.1.4