Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp5441427pxj; Wed, 26 May 2021 10:33:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxyVXAcWcprOM1AePyLp2fHYf+2zvKsHtgS62PDNxwZUhHurUTxZj2IH5uQe3nWIq1drXfF X-Received: by 2002:a17:907:78cc:: with SMTP id kv12mr2062624ejc.218.1622050425176; Wed, 26 May 2021 10:33:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622050425; cv=none; d=google.com; s=arc-20160816; b=LFuXofwlSaZk6CrT+qtH9a0SLB+SDvjpXUX1kJcC8+aLLGoz674QBw5DAdR+f6vw/S Q9nghLJJrh64xA56LTFtBn3mOwLVPiJXQ7XGkNA53lNOBszYkUFEVbgisNbzI9YZWIm1 280zMcZIfKUQQmfi340Ga9X7u4GFEHWK6CTbcsGshlMA6KAjznJoMTkL1tV9lFaoh2Xg KRN5QHWJfJ1I2hs3ZrXWhKfgd0k7Fq7O/w26c5XC0q8qUa6D5sC35fOi1F28KYQVTmQQ hT0ZB0zJCVQ41u/+ZYZAaspE74ycS1+3tCVe54C5f36KuqPyV0zxac5NR22Dnu7mvRYj ywcg== 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=dreSlGkmYUAr345SslUjWzdBde5v9W1Dmo4K5Iu9dKY=; b=C1MPejX+3LjI7qfAuA4EvIJ/qN5PM91SZOgeaz+b9QLMmhOA6dnMTABchPO3EGf7ec 6csTkvAtxSEUVS9BR+OQeIWCkGlw/Z6oUPcR65G+JVK7lYwfokrV30167hcYiST86VL8 Ri2NHQzVwfgVK6SzsFy+ikLZjsMaawrKP7qsFXhBoLqgsi3DcUJJ53yvJcjKGXYCEeLe zmXFY2FMwTWMrlXOH1z75exEz7SLlOsGxLIeHuT52iaQEjuu6ZkCFKFU9PShxJ/4h8br xSYn9T/HPhopEHhDvEkVKiBXY99EBSo/W/lPY2nMDeaGIVzKrOC48C97HxB+tY/DHG/F yprA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=y9jlCLlu; 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 rh18si1026493ejb.394.2021.05.26.10.33.21; Wed, 26 May 2021 10:33:45 -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=y9jlCLlu; 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 S232006AbhEZL3q (ORCPT + 99 others); Wed, 26 May 2021 07:29:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234469AbhEZL0d (ORCPT ); Wed, 26 May 2021 07:26:33 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1DECC061344; Wed, 26 May 2021 04:24:44 -0700 (PDT) Date: Wed, 26 May 2021 11:24:42 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1622028283; 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=dreSlGkmYUAr345SslUjWzdBde5v9W1Dmo4K5Iu9dKY=; b=y9jlCLluHlyLg5zM8n6QJNagz8dhjlH/4CbnGSGDGvaYr8cKEs896eqDrUegZ5+BGbcVXe LIHV19+Mdmjk4BWCIUTe7mJTtLro/GAmNtVX2dITL+Hei1qO2ZJ4ldumlmGBCAN+vjq8zI 4LP0w092o07BNTh8lVNeKLWv6OklCrimVxfhJSWK5juEN6BD2khkLOdRPnxnilIExuEBKB y5PDPhMwHR+ndoAFuoP7CMfOo3FH7re2QTFcwU57/N18V74scO8k2HxITWp1gWzYl5eOLP kb+DkoXUh80D8FZeQmKeDs63fpzLoVvH53mwxQy0h0Nwp3qena+SrwleemZTjQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1622028283; 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=dreSlGkmYUAr345SslUjWzdBde5v9W1Dmo4K5Iu9dKY=; b=8tEowypSrScWg1JStydbzG14+scj0UiwPcfFO9E4KRBt9AdyhjXT3ztClA/JKfDUZoDTRN t3PCT031+imKvYDg== 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: net: use linux/atomic.h for xchg & cmpxchg Cc: Mark Rutland , Boqun Feng , Peter Zijlstra , Will Deacon , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20210525140232.53872-3-mark.rutland@arm.com> References: <20210525140232.53872-3-mark.rutland@arm.com> MIME-Version: 1.0 Message-ID: <162202828269.29796.5719715173875797514.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: 201e2c1bbe659720913ed5272a2c44e6ab646c8a Gitweb: https://git.kernel.org/tip/201e2c1bbe659720913ed5272a2c44e6ab646c8a Author: Mark Rutland AuthorDate: Tue, 25 May 2021 15:02:01 +01:00 Committer: Peter Zijlstra CommitterDate: Wed, 26 May 2021 13:20:49 +02:00 locking/atomic: net: use linux/atomic.h for xchg & cmpxchg As xchg*() and cmpxchg*() may be instrumented by atomic-instrumented.h, it's necessary to include to use these, rather than , which is effectively an arch-internal header. In a couple of places we include , but get away with this as gets pulled in inidrectly by another include. Before we convert more architectures to use atomic-instrumented.h, let's fix these up to use so that we don't make things more fragile. 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-3-mark.rutland@arm.com --- net/core/filter.c | 2 +- net/sunrpc/xprtmultipath.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/core/filter.c b/net/core/filter.c index cae56d0..ce4ae1a 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -17,6 +17,7 @@ * Kris Katterjohn - Added many additional checks in bpf_check_classic() */ +#include #include #include #include @@ -41,7 +42,6 @@ #include #include #include -#include #include #include #include diff --git a/net/sunrpc/xprtmultipath.c b/net/sunrpc/xprtmultipath.c index 78c075a..1b40731 100644 --- a/net/sunrpc/xprtmultipath.c +++ b/net/sunrpc/xprtmultipath.c @@ -7,13 +7,13 @@ * Trond Myklebust * */ +#include #include #include #include #include #include #include -#include #include #include #include