Received: by 2002:a05:7412:8d09:b0:fa:4c10:6cad with SMTP id bj9csp181801rdb; Mon, 15 Jan 2024 17:33:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IEpRmARwxoYWZWsnhPoucS2hJZaRe6fBEiHDw/tcEe9uVs06uEn46ngqQscy7t0NNqDi+Yi X-Received: by 2002:a17:907:2d29:b0:a2b:a7e:3494 with SMTP id gs41-20020a1709072d2900b00a2b0a7e3494mr3775000ejc.10.1705368783073; Mon, 15 Jan 2024 17:33:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705368783; cv=none; d=google.com; s=arc-20160816; b=hQ6hCjWHDbqJ5yM10NItJefVgjTZy0mVVT1m8ss16uw+7ujv5TpkCVh3YLcGVoTDWM CSRKSdUwV6uZUzWpumq3vPnUomnwJDl83chL1qeUErfxIem3o4aYxFwEDL3X/QPbELfl iYzcrsH6a37oXLTcawTLIC2t2scWyvPU1i6bh5cmbuLMgcAIPiyZwV++PvJEiiXTXTxP TYkrMogcuXiL0IzM3SGLdvve0DRXWJ3Yfa2kQjkj8fxFOx1L3J+pmpN1wVSHyFmAjd2g NSBueDGBxgXe5pw9eWrH5it43byB3+WTzOj+8YZzwX/ZEbahzVWNzQ6axHayG4h5UZM2 fX6g== 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=91mkcmXBULATO57vewDVQp6gU4jv3PZjSk/yP0kR/gY=; fh=sZ1i4gUsrJh+r5gMbG7ORPCmtjK1yGBT7qy1tVqCt9U=; b=hbHRHdkbQTHo0f2PK3HHfIl2NCqwaa0956rVq+onTl0VPUE/+KsLuFLGfnrm901NI6 j9GWHgXgB5vqnNpPvArgX7HE6a9wkmcWEnP7ViDeRWeF7UMEbnok5IdIvaHo+mHcjRCQ FHNfEjX1hG7n/ewQR/Q0gMKo6XCMI4cOYbve7+/uUipKCAJbEojF7db4eCdLdIYYq0KV 6QDLiu8Z0O1E/0LVER97w8I4VrdsNA3bbueTpKQAcj7dsr/AQeOfVGb6M1/dGkRmWhiU qGRbZQ/is1kKLaYh+x3FlLReFomWnwF3oLwy0OLFRcEt3WovFyplD1oaftB6prapCitY Tv5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=aM7bJ4v+; spf=pass (google.com: domain of linux-kernel+bounces-26856-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-26856-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id bo7-20020a170906d04700b00a2c9437f1e2si3685846ejb.59.2024.01.15.17.33.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 17:33:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-26856-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=aM7bJ4v+; spf=pass (google.com: domain of linux-kernel+bounces-26856-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-26856-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 am.mirrors.kernel.org (Postfix) with ESMTPS id C38781F23516 for ; Tue, 16 Jan 2024 01:33:02 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 766D624216; Tue, 16 Jan 2024 01:06:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="aM7bJ4v+" 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 A97772420C; Tue, 16 Jan 2024 01:06:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 366C6C433F1; Tue, 16 Jan 2024 01:06:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705367217; bh=G7KKNtunMq/+ZIMrUvnMm3p3/u15EMWrNrCPsESRQko=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aM7bJ4v+JqjihoQO5il4xbqkT1+nJjR1bi4rSqpuwysTHuOoigIFG+J8NNEvKwues Fe65PSZU/IxDnm5SCtRttVn5C/aE0o0twXEivhTY2QVr5FbhhkUmXLVbeH+FNT8qEg /sDFmDigwjOcGw60M8f0oBuXSAkpo6OwvJKC7kTtHi/QjEFSDokN9lcXcRNvKEulOb uE9wc8cSZgELSkLfjl7SE1rf4CSXtkRTzoxxGb8KKIXHLcrx4wthcpFsxkc1RGd9Nc xWSAIkp2BddzU8KS72bOEV5ZkBQVjt3j7zG9As0Jg7m6yUfXG6taZAPyLxUqikhb+/ +5AyTMkHdW1Yw== 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, arnd@arndb.de, mark.rutland@arm.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 6.1 06/14] arm64: Fix circular header dependency Date: Mon, 15 Jan 2024 20:06:08 -0500 Message-ID: <20240116010642.218876-6-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240116010642.218876-1-sashal@kernel.org> References: <20240116010642.218876-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 6.1.73 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 aa3d3607d5c8..f7a204a9352c 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