update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/arm64/kvm/Makefile
..
..
@@ -3,37 +3,25 @@
3
3
 # Makefile for Kernel-based Virtual Machine module
4
4
 #
5
5
 
6
-ccflags-y += -Iarch/arm64/kvm -Ivirt/kvm/arm/vgic
7
-CFLAGS_arm.o := -I.
8
-CFLAGS_mmu.o := -I.
6
+ccflags-y += -I $(srctree)/$(src)
9
7
 
10
8
 KVM=../../../virt/kvm
11
9
 
12
-obj-$(CONFIG_KVM_ARM_HOST) += kvm.o
13
-obj-$(CONFIG_KVM_ARM_HOST) += hyp/
10
+obj-$(CONFIG_KVM) += kvm.o
11
+obj-$(CONFIG_KVM) += hyp/
14
12
 
15
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o $(KVM)/vfio.o
16
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/arm.o $(KVM)/arm/mmu.o $(KVM)/arm/mmio.o
17
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/psci.o $(KVM)/arm/perf.o
13
+kvm-y := $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o \
14
+	 $(KVM)/vfio.o $(KVM)/irqchip.o \
15
+	 arm.o mmu.o mmio.o psci.o perf.o hypercalls.o pvtime.o \
16
+	 inject_fault.o va_layout.o handle_exit.o \
17
+	 guest.o debug.o reset.o sys_regs.o \
18
+	 vgic-sys-reg-v3.o fpsimd.o pmu.o \
19
+	 arch_timer.o trng.o\
20
+	 vgic/vgic.o vgic/vgic-init.o \
21
+	 vgic/vgic-irqfd.o vgic/vgic-v2.o \
22
+	 vgic/vgic-v3.o vgic/vgic-v4.o \
23
+	 vgic/vgic-mmio.o vgic/vgic-mmio-v2.o \
24
+	 vgic/vgic-mmio-v3.o vgic/vgic-kvm-device.o \
25
+	 vgic/vgic-its.o vgic/vgic-debug.o
18
26
 
19
-kvm-$(CONFIG_KVM_ARM_HOST) += inject_fault.o regmap.o va_layout.o
20
-kvm-$(CONFIG_KVM_ARM_HOST) += hyp.o hyp-init.o handle_exit.o
21
-kvm-$(CONFIG_KVM_ARM_HOST) += guest.o debug.o reset.o sys_regs.o sys_regs_generic_v8.o
22
-kvm-$(CONFIG_KVM_ARM_HOST) += vgic-sys-reg-v3.o fpsimd.o
23
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/aarch32.o
24
-
25
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic.o
26
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-init.o
27
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-irqfd.o
28
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-v2.o
29
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-v3.o
30
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-v4.o
31
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-mmio.o
32
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-mmio-v2.o
33
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-mmio-v3.o
34
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-kvm-device.o
35
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-its.o
36
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-debug.o
37
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/irqchip.o
38
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/arch_timer.o
39
-kvm-$(CONFIG_KVM_ARM_PMU) += $(KVM)/arm/pmu.o
27
+kvm-$(CONFIG_HW_PERF_EVENTS)  += pmu-emul.o