From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4E4B6C3DA79 for ; Tue, 16 Jan 2024 01:08:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=JSidIG/IITSVvdca83U+sdhj0PQZ1wcCgZiW9FiAL6Q=; b=0Oh6lmqULZpdyh J2br6x0WB5eaR8LxNzXphHDjJ5dDP8vhn3v+gJ43H/LE0hO4iYqyf3n8w+sbZmv29H0MZrY9Na9eo SvsRfPYqMiLEUo9FucbmlinvnTTbBFq+2jsLXqRFgV+gxLkVVjyUQedH381tvLf7Dm7YrBpJckva4 ERFljr69HKxDZJom+a8ElTZ8P5eOVnmrAtYGJRXwcddbeJVHu6l/Nqt1G4uvTlFPQHPfU70KWJh0I bjWDXGFUvml89INqCemegTXP8slN02DC9N9zUw0ghkUTg9ADVfduPBy58+XXP+IEvY3AP0wjMEJjL GyizEp8zu/0U+fI2sBuQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rPXvi-00AdBK-28; Tue, 16 Jan 2024 01:07:50 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rPXvd-00Ad6s-0O for linux-arm-kernel@lists.infradead.org; Tue, 16 Jan 2024 01:07:46 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 294EFCE18A4; Tue, 16 Jan 2024 01:07:43 +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> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.147 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240115_170745_336227_9DE1A5CA X-CRM114-Status: UNSURE ( 9.66 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel