Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp5433209pxj; Wed, 26 May 2021 10:21:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxACoRZBx9Vlhr4kSXBzkmONt++A/N4Y6+f70YboHj+bg5kXc5FM8k8hCecT9PLEINj7Od7 X-Received: by 2002:a92:cc4c:: with SMTP id t12mr26758143ilq.232.1622049703895; Wed, 26 May 2021 10:21:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622049703; cv=none; d=google.com; s=arc-20160816; b=f5hyChE9bUwB9ShMDnY8hnQ323rf/2UKOsGMuYgeuKRQD5LASFGymEbE0Fvqx3FT8F ih4YrkD8LY2gQM9Tjr4kpdbJWPKOFLCm+gvDqbePF92tVm2Kf4uA4OqXvdoK+ErO5PNb x7U6cDNGC55SyBlvqtr+/+yBsOP+ID+CObYS3f8Qz29L1F+KU6vQz3agQUH6NDYohEgS 13d3oKkxxabX/CGSMgCCOFafe670IZR/Zxi89aJNRG34D8THzuhsP6QhAtc/GLJFA4n6 OYC8RHeX376R0vfs+SKy/rrryWTxl10gUn77UrELrTDZHqt2dI7iucdc8gwkhEIelZhV tmJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=tbiKnn+SGtcVMX2rvQDz1xcrCbq8nTC6mKG3ufXSPMk=; b=v6kJaiYiOhz9XToQx1AofGw+t4SGDtxbIQvLZzISf2Eldvwrf42vfkMsn+5oZYF8W0 CHl95Fgty7YdCm7kXU0bGwIaoFcbp3Q9YrQVSXR9UkBAHXIZXBvSZLyahX030fJBGb3q mgweKtQMpqlDrCRVVqOcN9WHIF+NzcQ6fqJK6erSm6VvXiFvpU7U/eoECg9WSwGQh6ls eFWe63C63xMVJ0p88zTi9gH2CEraMj7ccIXf+uIUHJWO1FVSGrmlDwan69NrSMyGV3s3 CohbgbDPmP+yBdNpLdH0i+0RhBn0c8HVJngcAGIXDxD6rB9nAE/ctT6OKbGq5louOpBB Berg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=s8DawyD2; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u10si21307175jad.109.2021.05.26.10.21.16; Wed, 26 May 2021 10:21:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=s8DawyD2; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234628AbhEZL2O (ORCPT + 99 others); Wed, 26 May 2021 07:28:14 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:54830 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234380AbhEZL0N (ORCPT ); Wed, 26 May 2021 07:26:13 -0400 Date: Wed, 26 May 2021 11:24:40 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1622028281; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tbiKnn+SGtcVMX2rvQDz1xcrCbq8nTC6mKG3ufXSPMk=; b=s8DawyD2xxt8zGT5Zn287hJtWyTOPtzjT/ZyPKYiPUfc0u6Og8zQWdxf/PWLsYcV3XdOvf tPGUv478y+Qpgn2R86aRwIyAtOLYGYPzypA8K2y4NTGqb7Nl/PAC+8IwcLn6elK2ul2hnh dDwMDvAG4fpBrrM0cEXVKH2WvZy7XG6rl1Myx1Q3SvA+FNohkKtdfVTetcl/GK4CLZK85M 9kb9MZWMtCTDJDx3wDl40ESQJL/gHc9jf7lhAGshbszndn48ryDA/z3N6Yr8gtM7JviPbf 3Z71hqNxglXzLvL5Mh7GuGYF+jbWmc8BgVRUZnoETMSO2scAakp0muy2MJESBg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1622028281; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tbiKnn+SGtcVMX2rvQDz1xcrCbq8nTC6mKG3ufXSPMk=; b=4/o7tY1iCIqTSjSs14P2VrynZ2JYj5KoQFreJGThIRVv+hNLS38xw6P8EfOwQFCHdDi32P V1aeWsqigEkedlCQ== From: "tip-bot2 for Mark Rutland" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: locking/core] locking/atomic: atomic: remove redundant include Cc: Mark Rutland , Boqun Feng , Peter Zijlstra , Will Deacon , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20210525140232.53872-8-mark.rutland@arm.com> References: <20210525140232.53872-8-mark.rutland@arm.com> MIME-Version: 1.0 Message-ID: <162202828040.29796.18228050500392173094.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the locking/core branch of tip: Commit-ID: 89eb78d542394a8461164009272ea654357795ad Gitweb: https://git.kernel.org/tip/89eb78d542394a8461164009272ea654357795ad Author: Mark Rutland AuthorDate: Tue, 25 May 2021 15:02:06 +01:00 Committer: Peter Zijlstra CommitterDate: Wed, 26 May 2021 13:20:50 +02:00 locking/atomic: atomic: remove redundant include Since commit: 560cb12a4080a48b ("locking,arch: Rewrite generic atomic support") ... we conditionally include before defining atomics using locking, and hence do not need to do so unconditionally later in the header. This patch removes the redundant include. Signed-off-by: Mark Rutland Cc: Boqun Feng Cc: Peter Zijlstra Cc: Will Deacon Signed-off-by: Peter Zijlstra (Intel) Link: https://lore.kernel.org/r/20210525140232.53872-8-mark.rutland@arm.com --- include/asm-generic/atomic.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h index ebacbc6..d4bf803 100644 --- a/include/asm-generic/atomic.h +++ b/include/asm-generic/atomic.h @@ -143,8 +143,6 @@ ATOMIC_OP(xor, ^) #define atomic_set(v, i) WRITE_ONCE(((v)->counter), (i)) -#include - static inline void atomic_add(int i, atomic_t *v) { atomic_add_return(i, v);