From patchwork Fri May 4 17:39:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 135017 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp324140lji; Fri, 4 May 2018 10:40:44 -0700 (PDT) X-Google-Smtp-Source: AB8JxZog2NrQ6fONT9Gr++CrvwY8c8IKRaCP6rRvSE/V/EVRcyILMHOKhGxul0I48oRoQHg0m+Ty X-Received: by 10.98.64.130 with SMTP id f2mr27752542pfd.83.1525455644124; Fri, 04 May 2018 10:40:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525455644; cv=none; d=google.com; s=arc-20160816; b=XrwmKmRRQmnlmwQTnjvi82nPEvvgiY7DqHfr40NpVZtOlgLgkb2EhqNzFxOC2OQGrC 0n6mtLCEwgF+RjNXHj64FrZtj2weZ9I5daYnDx0g8xR7uw01i8pvKmJqP8KT9vO0qTWp Re6JocZqTECzPt1ZaFsdS9yIwbK0oF/ZsXgFqzERxGS9DnTnKnChY6aaIdOgsJjjUBKY /RiGx4f48SJV6mz8WQT+Mux1vhlvCC0SvF4CPkmePaCKiAK1NgbAGjVCwzZ1lm2KINxo Uwidn5o8adt4gGA9KUK17TxS67vhHLbkM20DEflf/sHcL2+DryjGFS2XdkzEGcJPHk75 JNwQ== 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=3b4ey3XCaSJqjTZacUpPg6GFGIkUWEWnL1NGv/MfGus=; b=yayBGEn+QDUo6TLjKAYlfrLLvFNpQbL5yGwlafWNdZrg620xrfQRPxV/c46/dyHz02 WyzbB99n0upUMt4TKzEX7v0cUpzPiGQJaHqk/SBz/7QpJDy3KVNMhXmdDoAb4C/XaHoW +eZqsKAcdT33EASmM0QUvCgGPVb5zPlPjLgw/skptgLGNpMzQ3vM94gxN0odxHJ1wkip Tm9Mhp6hpYlepzfW3qurpSYvWtfMEHM5iGKOxuozTmEhcANengBHz05CAbiMnZHzkvS6 uqj13ONhpl75a54bQovnkZr/zm6+MwRz3pq4SpepMBES7c6YRHqp/Oyqqu08fqZzWsWz YcDQ== 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 o186-v6si13557208pga.350.2018.05.04.10.40.43; Fri, 04 May 2018 10:40:44 -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 S1752018AbeEDRkE (ORCPT + 29 others); Fri, 4 May 2018 13:40:04 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:57390 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751807AbeEDRj7 (ORCPT ); Fri, 4 May 2018 13:39:59 -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 EE4B11682; Fri, 4 May 2018 10:39:58 -0700 (PDT) Received: from lakrids.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 301D43F487; Fri, 4 May 2018 10:39:57 -0700 (PDT) From: Mark Rutland To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, aryabinin@virtuozzo.com, boqun.feng@gmail.com, catalin.marinas@arm.com, dvyukov@google.com, mark.rutland@arm.com, mingo@kernel.org, peterz@infradead.org, will.deacon@arm.com Subject: [PATCH 3/6] arm64: use for cmpxchg Date: Fri, 4 May 2018 18:39:34 +0100 Message-Id: <20180504173937.25300-4-mark.rutland@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180504173937.25300-1-mark.rutland@arm.com> References: <20180504173937.25300-1-mark.rutland@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently a number of arm64-specific files include for the definition of the cmpxchg helpers. This works fine today, but won't when we switch over to instrumented atomics, and as noted in Documentation/core-api/atomic_ops.rst: If someone wants to use xchg(), cmpxchg() and their variants, linux/atomic.h should be included rather than asm/cmpxchg.h, unless the code is in arch/* and can take care of itself. ... so let's switch to for these definitions. Signed-off-by: Mark Rutland Cc: Catalin Marinas Cc: Will Deacon --- arch/arm64/include/asm/pgtable.h | 2 +- arch/arm64/include/asm/sync_bitops.h | 2 +- arch/arm64/mm/fault.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- 2.11.0 diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 7c4c8f318ba9..c797c0fbbce2 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -39,8 +39,8 @@ #ifndef __ASSEMBLY__ -#include #include +#include #include #include #include diff --git a/arch/arm64/include/asm/sync_bitops.h b/arch/arm64/include/asm/sync_bitops.h index eee31a9f72a5..24ed8f445b8b 100644 --- a/arch/arm64/include/asm/sync_bitops.h +++ b/arch/arm64/include/asm/sync_bitops.h @@ -3,7 +3,7 @@ #define __ASM_SYNC_BITOPS_H__ #include -#include +#include /* sync_bitops functions are equivalent to the SMP implementation of the * original functions, independently from CONFIG_SMP being defined. diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 4165485e8b6e..bfbc695e2ea2 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -18,6 +18,7 @@ * along with this program. If not, see . */ +#include #include #include #include @@ -34,7 +35,6 @@ #include #include -#include #include #include #include