From a7ff4a258ce58262bdc59a96d48efbcc5dccc388 Mon Sep 17 00:00:00 2001
From: Will Deacon <willdeacon@google.com>
Date: Thu, 7 Jul 2022 15:51:51 +0100
Subject: [PATCH] Revert "FROMGIT: KVM: arm64: vgic: Replace kernel.h with the
 necessary inclusions"

This reverts commit de680fdc4b3a93c69d8441bf2e4102be66f8a5de.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I9bb0ad2b102a3415d5a3e57bb3c07ca5b45985f7
---
 include/kvm/arm_vgic.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h
index bb30a6803d9f..e602d848fc1a 100644
--- a/include/kvm/arm_vgic.h
+++ b/include/kvm/arm_vgic.h
@@ -5,11 +5,9 @@
 #ifndef __KVM_ARM_VGIC_H
 #define __KVM_ARM_VGIC_H
 
-#include <linux/bits.h>
+#include <linux/kernel.h>
 #include <linux/kvm.h>
 #include <linux/irqreturn.h>
-#include <linux/kref.h>
-#include <linux/mutex.h>
 #include <linux/spinlock.h>
 #include <linux/static_key.h>
 #include <linux/types.h>