Received: by 2002:a05:7412:8d09:b0:fa:4c10:6cad with SMTP id bj9csp183705rdb; Mon, 15 Jan 2024 17:38:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IHUovLydqB4xSvbDEHQkPMpXq6m26UAgGAYOMTl5E9qwZgOnLuySWful28pzvDDRQcZNcfW X-Received: by 2002:a17:903:1ca:b0:1d4:e2bc:88fb with SMTP id e10-20020a17090301ca00b001d4e2bc88fbmr4102568plh.102.1705369116839; Mon, 15 Jan 2024 17:38:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705369116; cv=none; d=google.com; s=arc-20160816; b=f8K6WlQKHWHCuwdcRqSAxygBJQi3mouOKAEvd4FcbH5e3sYjhkCVjQyXNSpLwwlg6X iKT2c+o6aJXPECC8PXRW13bgtZW7pqadPRua+tGU7eBZ4kDbxLurt2mwkS4iAiTqFddb zd2/z+PBP+/D9XHN8J3GkZ1aOdvUJtMwz8TpnRbJSy4kZP4F3HJaRVPHwL0Uvk0iWbUt 0i+pFcGVlcNR5gbPK3n2fzOu4gy0SkOms03C3+SL0/Y3l1XEN8Z3w9DPiO5byWBsQDmE RRSu9sN29A1k8c6SRfGL/FYEn4Lym8hh+zCo6orf+tMmdnXijWm/YIsorULJBwY/uvaF /HRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=ADxMhjiRFdhbYCOuBgfkf0PFofA1+lPp1pQ2wYVk1SM=; fh=mo91nsZ79ZaS74embN0TLbeaxHH/ug64EZ2BdOBJx+A=; b=wOB+CGQSay7x2jjrhw02Ab5yumVg19BIjt+dO/woei2yIO7C0pKoSVO2xEP0kcZey7 dh5SQNdA0YuiP0zS4nTlXRC9O3HK4KpkjDWvw6DJYBRUm+0pjh75ey5GEMvpwSYVw/Op 42e78b0rAwPjH337ao7S7PliVEws3Q+9vxkAyPPnrgVal5OTNX0Jr06NArIaOtgFZ2/K Ecxt2A+QSyS74fiJBV/g1u1XeQ6oC56PDI7xvO/R+L+ZlBBk5iO/8/l5CV2v2vppNB+h A2LRSXKOmqiipXEdBj23OI4mh8Mcxax0qR08PB0sqgylzWrgwck1l4ahFusXP24wkI9c qcFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=DGKVq+BS; spf=pass (google.com: domain of linux-kernel+bounces-26869-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-26869-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id jx5-20020a170903138500b001d453cffba2si9724541plb.391.2024.01.15.17.38.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 17:38:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-26869-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=DGKVq+BS; spf=pass (google.com: domain of linux-kernel+bounces-26869-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-26869-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 5A671B20813 for ; Tue, 16 Jan 2024 01:38:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 993672A8D7; Tue, 16 Jan 2024 01:07:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="DGKVq+BS" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CE71928E38; Tue, 16 Jan 2024 01:07:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4F8A2C433C7; Tue, 16 Jan 2024 01:07:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705367262; bh=gbvGgTDEjv3h6cJ8jC0L0xUeG38FiPqcSYJiJolFY4U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DGKVq+BSDlgNvj0wmsm9KTpYgPlE4YeL1oOmz74RIklxyMzwjsubXyOv6V1Zsg+lF jLfiYGBBwJleF2Xnne7y/9u1eR0aa6EnUyNW/G1kFzoC4TVY97MI9WDMToPrJdk1gr euvCtMvh49QpcLjsmi8WxKv0rJQ4SP4+siMLLbLAT0BuXbZ5EL0EirtHAskUppnHE3 sL+Sw0PqR3QuFM+w6METfhvYJLe5ZsmgVQP+HJ8RwzAxVEsifAiaIv9gvCTq9tRGSA 26cCDybFS/x/IOG3VKGHcX2iou6cD2+UEm89rdhrXjEPdOEZhIx2+i1jdhGmvxJju5 DAoHmv0B9T84w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kent Overstreet , Suren Baghdasaryan , Sasha Levin , catalin.marinas@arm.com, will@kernel.org, keescook@chromium.org, arnd@arndb.de, mark.rutland@arm.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.15 05/11] arm64: Fix circular header dependency Date: Mon, 15 Jan 2024 20:07:05 -0500 Message-ID: <20240116010729.219219-5-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240116010729.219219-1-sashal@kernel.org> References: <20240116010729.219219-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.147 Content-Transfer-Encoding: 8bit From: Kent Overstreet [ Upstream commit 04bc786d663543512d08f1b86c7bcefb5144afe3 ] Replace linux/percpu.h include with asm/percpu.h to avoid circular dependency. Signed-off-by: Kent Overstreet Signed-off-by: Suren Baghdasaryan Signed-off-by: Sasha Levin --- arch/arm64/include/asm/spectre.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/spectre.h b/arch/arm64/include/asm/spectre.h index db7b371b367c..31823d9715ab 100644 --- a/arch/arm64/include/asm/spectre.h +++ b/arch/arm64/include/asm/spectre.h @@ -13,8 +13,8 @@ #define __BP_HARDEN_HYP_VECS_SZ ((BP_HARDEN_EL2_SLOTS - 1) * SZ_2K) #ifndef __ASSEMBLY__ - -#include +#include +#include #include #include -- 2.43.0