From: Marc Zyngier <maz@kernel.org>
Date: Sun, 10 Oct 2021 14:56:27 +0000 (+0100)
Subject: KVM: arm64: Don't include switch.h into nvhe/kvm-main.c
X-Git-Tag: v5.16-rc1~153^2~4^2~1^2~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc1e6fdfa92b82902883b70dafa729d3bd427b80;p=thirdparty%2Fkernel%2Flinux.git

KVM: arm64: Don't include switch.h into nvhe/kvm-main.c

hyp-main.c includes switch.h while it only requires adjust-pc.h.
Fix it to remove an unnecessary dependency.

Signed-off-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Fuad Tabba <tabba@google.com>
Link: https://lore.kernel.org/r/20211010145636.1950948-3-tabba@google.com
---

diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c
index 2da6aa8da8680..8ca1104f4774b 100644
--- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c
+++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c
@@ -4,7 +4,7 @@
  * Author: Andrew Scull <ascull@google.com>
  */
 
-#include <hyp/switch.h>
+#include <hyp/adjust_pc.h>
 
 #include <asm/pgtable-types.h>
 #include <asm/kvm_asm.h>