Message ID | 1527869189-31512-6-git-send-email-will.deacon@arm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 00FD06028F for <patchwork-linux-arm@patchwork.kernel.org>; Fri, 1 Jun 2018 17:05:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E901A28C8A for <patchwork-linux-arm@patchwork.kernel.org>; Fri, 1 Jun 2018 17:05:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DD6EB28D0D; Fri, 1 Jun 2018 17:05:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8A59C28C8A for <patchwork-linux-arm@patchwork.kernel.org>; Fri, 1 Jun 2018 17:05:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=osHi9aNmtznrWxtbaPb14EEIr9otkw0/I59caWOCKWE=; b=lzMGm/geCBEKVHrDEMJPhxX6BJ IxJf8Pdrn3QMKgnXH6bS7dP9xtOTEPyrrF+jHJY6P0cZLYrtjJb2BR9s84EzuSkj/KflW+kavcnqm 8tt+zvFZ68SRgc7R0bjooPZ7otjhiTRw4C/RGfU5ec9afZFEbxKnQZmFBu5683F56KpD6/YLyAcrv oLWhyd3OFiMsz+kRr/pWhb3Gm4ZhWWIWhWTjrygpuAWdp53WCc2krKS/ak0aDws3ny+H5sobnPKP6 nFN7hhqnvdmbP3ymZEjuTTMfmdroccFj/TnD99lWrMNM7bdkvI/Dr4N+ml8IHQfhhzJygRcr5jEaE KbvcFccw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fOnUT-0004HC-Rj; Fri, 01 Jun 2018 17:05:25 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fOnUS-0004Dg-8y for linux-arm-kernel@bombadil.infradead.org; Fri, 01 Jun 2018 17:05:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Cc8BEwAhVFO5E0uxxh5DaP653Zwr8wKoE8TAsag6eVg=; b=OExVvPJtyV72MBYf/KOJ2RfYN Yn+AqiahDmMxB1xdiuA7kuMAzCY4jf80KHKahjM5Fjtfgs0/QYOxOpaNx/DX4MVhIcHrT4e6oV7uu Hw6Ks/RK+gycPySRnwzpIBMKMyKjoxX6iNC10Z45NyBFpd6QKRP6oW00pxEkmFEbC8f2UlMNcRhr4 NnK60o+Vtk7o3cmwcn6nKTKXUoliaJIcQlVX+yM0THS27EK6UyMrc5gokcgTH62m5yOizwkRy0nUP u7J7Eg/EPzJRp8mxRnVGHpYJAe2WJh/hm5iJoRffC3RUYEv3q/qFlhR6wFreGvopY3pwqYsaqN/i1 zswzY8xAw==; Received: from foss.arm.com ([217.140.101.70]) by merlin.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fOmZQ-0006G2-JO for linux-arm-kernel@lists.infradead.org; Fri, 01 Jun 2018 16:06:29 +0000 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 9EB4E165D; Fri, 1 Jun 2018 09:06:00 -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 70E2D3F557; Fri, 1 Jun 2018 09:06:00 -0700 (PDT) Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id 606431AE514F; Fri, 1 Jun 2018 17:06:30 +0100 (BST) From: Will Deacon <will.deacon@arm.com> To: linux-kernel@vger.kernel.org Subject: [PATCH v2 5/9] sh: Don't pull in all of linux/bitops.h in asm/cmpxchg-xchg.h Date: Fri, 1 Jun 2018 17:06:25 +0100 Message-Id: <1527869189-31512-6-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1527869189-31512-1-git-send-email-will.deacon@arm.com> References: <1527869189-31512-1-git-send-email-will.deacon@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180601_120628_706024_DC63163B X-CRM114-Status: GOOD ( 13.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Cc: peterz@infradead.org, yamada.masahiro@socionext.com, Will Deacon <will.deacon@arm.com>, mingo@kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/arch/sh/include/asm/cmpxchg-xchg.h b/arch/sh/include/asm/cmpxchg-xchg.h index 1e881f5db659..593a9704782b 100644 --- a/arch/sh/include/asm/cmpxchg-xchg.h +++ b/arch/sh/include/asm/cmpxchg-xchg.h @@ -8,7 +8,8 @@ * This work is licensed under the terms of the GNU GPL, version 2. See the * file "COPYING" in the main directory of this archive for more details. */ -#include <linux/bitops.h> +#include <linux/bits.h> +#include <linux/compiler.h> #include <asm/byteorder.h> /*
The sh implementation of asm/cmpxchg-xchg.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 linux/bits.h and linux/compiler.h Signed-off-by: Will Deacon <will.deacon@arm.com> --- arch/sh/include/asm/cmpxchg-xchg.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)