From patchwork Thu May 24 10:59:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 136739 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp2043692lji; Thu, 24 May 2018 04:02:49 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrCbFRf4MxCF4lKpGAHq2K0+wKozpUMmxmSam9Ql4KdvQB0vAGpZVI6IEKArem8ZTU6vApz X-Received: by 2002:a17:902:264:: with SMTP id 91-v6mr6803335plc.341.1527159769051; Thu, 24 May 2018 04:02:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527159769; cv=none; d=google.com; s=arc-20160816; b=rPzk+XRp3p70jJx5Fi1qYHMQ7cjza3SdjIzJht81Ps3BD76ktw3ItIacqn1G9UVAEQ coYQfT3SPWpxtk6fjA2WZdNi3SJSZyDp1JQSzGUK/+8SpiNJ/OA2nbmgPV6Vo5K4WrcD liKE3jgMuY0AnwOyKNOZwm768wCqwnQEDZRj7qnw6ZnmU7dS4qT/uP87bC05Cco+l6BL /1MeCmAR3OUxZhwndB3tB+Snw4n7ciH/0rmwtNyn3w0G/5ENMBJVwTOHfMdrJ+Xnq1VT kRPeKPdyozk3AGST8ekJnlCcMk2uSvh0Ca5zt3mcZL59cvwo6hQiE/bU7lM/9X7wtdTB /Tww== 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=Cc8BEwAhVFO5E0uxxh5DaP653Zwr8wKoE8TAsag6eVg=; b=CL6vYjSn62EjRuYVsEFUuvHrvTAYgBxHOLtqzin72lXY57k1F9v6ORDQC0XFN+VwxM J7LFHYxqnctXuoHXGrQkggLrQDrQNw7Xvgb6j351bLzhUuw9L6qGKaeJnMt9lIoR7nLP TUH56z5V218t/myAQTvdleLbH4kyrwHrzHexM/nXw4iYKHSv70WXcbemkwfphMgZGBrv k0ryPAiSSvIqH+IbWwmzbUTH/UbwSUY16kLxqBdvkVhmKdWJ1IQ4/uhGlbVKutkphK2f irfYEru8awx3Stae4Nkud4Ll3WC9FIb37QMZSfxiEzfsrrcd4h8pw9qUFzln6Pwy3H01 sW0A== 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 x32-v6si20519637pld.435.2018.05.24.04.02.48; Thu, 24 May 2018 04:02:49 -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 S1032777AbeEXLCq (ORCPT + 30 others); Thu, 24 May 2018 07:02:46 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:40982 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1032476AbeEXK7V (ORCPT ); Thu, 24 May 2018 06:59:21 -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 65A5B16A0; Thu, 24 May 2018 03:59:20 -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 363B43F25D; Thu, 24 May 2018 03:59:20 -0700 (PDT) Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id 982551AE38C3; Thu, 24 May 2018 11:59:47 +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 Subject: [PATCH 5/9] sh: Don't pull in all of linux/bitops.h in asm/cmpxchg-xchg.h Date: Thu, 24 May 2018 11:59:42 +0100 Message-Id: <1527159586-8578-6-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1527159586-8578-1-git-send-email-will.deacon@arm.com> References: <1527159586-8578-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 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 --- arch/sh/include/asm/cmpxchg-xchg.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.1.4 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 +#include +#include #include /*