From patchwork Tue Jun 19 12:53:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 139118 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5172706lji; Tue, 19 Jun 2018 05:55:35 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKvT9pif5xP8dInvaSH6tt8hzU2JXIL3RcgYI4XR9NbhuMsMYbGV4xAcEhKmv0t7DkGf3WL X-Received: by 2002:a65:4d08:: with SMTP id i8-v6mr14859911pgt.427.1529412935654; Tue, 19 Jun 2018 05:55:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529412935; cv=none; d=google.com; s=arc-20160816; b=Sxz1I/h8iOpHAUPlUtv5fnJsutOyZlbGzLhiOWUM2iVvpPCm9eLbLxncwKFeg5nV1d Z2CVhb+jH22qqDwqX06YRB218hEpk7waZ2ihB3bjBzJc1m9l2HOdDVUfj4KjZ1+wu2Wz 5HXcz3F8CN3Z45cCTH1xFsw3Fwae8A3rRVMqTYEv8La+oY/LFu2xmlpmRB3jc/P6xmnY h4ne5TKLdN1MD5oxNdJTqA/zumrm/FanFGZP/j/hWcMsqPZdhgyxO6ByVLQ5HaMnTHkO v9Y4KkrVUinhiI3UNU701j7CRX21eI69oYU1I4ysVVKYmGKbgSkzsk8I57owzJa53bvm UBxg== 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=//QOMuPzMbUFU/Px57jKoaHSiE9SJM4w4mLtMoekew8=; b=FPaU7E6jdBVqdwk6p/PSWskLA45TFClntRW/3FHJ3uF8D0F6/zAhNkda9GQ6AUwcMl UIyh83RyY0JzvAM3VHeUUAdvemvsLtm6Mxf+iwU9XqwpP/VfighoDbdE2s+sknhc5QRM 88Fu9C1mFScMu7aYKmVdR3ZL312srJ9UuM0KXN6G3Y/rOHJ3uxk/Z/QzZFqi4tk8HqNm GKO5suMUz3+YuzqUU0e47+efKrjaQjvXagpRYDYJu+pktIdMxhKWJtcud2grcossed3F FPeGNEfCCEHwzaJ0cMH8MSngN8p2W1H6q9YKa5Ko2sY/EAghmU3nS3fKFpFTYsJeHzi0 rUgg== 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 a76-v6si18919598pfk.35.2018.06.19.05.55.35; Tue, 19 Jun 2018 05:55:35 -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 S937905AbeFSMzR (ORCPT + 30 others); Tue, 19 Jun 2018 08:55:17 -0400 Received: from foss.arm.com ([217.140.101.70]:49350 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S937858AbeFSMwl (ORCPT ); Tue, 19 Jun 2018 08:52:41 -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 09418165C; Tue, 19 Jun 2018 05:52:41 -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 CF18D3F59C; Tue, 19 Jun 2018 05:52:40 -0700 (PDT) Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id CC47F1AE36A0; 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 Subject: [RESEND PATCH v2 5/9] sh: Don't pull in all of linux/bitops.h in asm/cmpxchg-xchg.h Date: Tue, 19 Jun 2018 13:53:10 +0100 Message-Id: <1529412794-17720-6-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 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 Acked-by: Peter Zijlstra (Intel) 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 /*