Fix the patch

raspiduino · Nov 7, 2021 · 0797d65 · 0797d65
1 parent b4ab23c
commit 0797d65
Show file tree

Hide file tree

Showing 109 changed files with 17,870 additions and 3,492 deletions.
diff --git a/.config b/.config
diff --git a/.config.old b/.config.old
diff --git a/.version b/.version
@@ -0,0 +1 @@
+1
diff --git a/Module.symvers b/Module.symvers
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
@@ -45,11 +45,14 @@
 #include <asm/kvm_coproc.h>
 #include <asm/kvm_psci.h>
 
+#include <linux/arm.h> // Quick and dirty wrapper
+#include <linux/vmm-kvm.h>
+
 #ifdef REQUIRES_VIRT
 __asm__(".arch_extension	virt");
 #endif
 
-static DEFINE_PER_CPU(unsigned long, kvm_arm_hyp_stack_page);
+//static DEFINE_PER_CPU(unsigned long, kvm_arm_hyp_stack_page);
 static kvm_cpu_context_t __percpu *kvm_host_cpu_state;
 static unsigned long hyp_default_vectors;
 
@@ -806,8 +809,7 @@ long kvm_arch_vm_ioctl(struct file *filp,
 	}
 }
 
-+static unsigned long hyp_stack_base;
-+void vmm_init_kvm(phys_addr_t code, phys_addr_t boot_pgd_ptr, phys_addr_t pgd_ptr, unsigned long hyp_stack_ptr, unsigned long vector_ptr);
+static unsigned long hyp_stack_base;
 
 static void cpu_init_hyp_mode(void *dummy)
 {
@@ -823,6 +825,7 @@ static void cpu_init_hyp_mode(void *dummy)
 	boot_pgd_ptr = kvm_mmu_get_boot_httbr();
 	pgd_ptr = kvm_mmu_get_httbr();
 	//stack_page = __this_cpu_read(kvm_arm_hyp_stack_page);
+	stack_page = hyp_stack_base;
 	hyp_stack_ptr = stack_page + PAGE_SIZE;
 	vector_ptr = (unsigned long)__kvm_hyp_vector;
 
@@ -1037,7 +1040,7 @@ static int init_hyp_mode(void)
 	free_percpu(kvm_host_cpu_state);
 out_free_mappings:
 	free_hyp_pgds();
-out_free_stack_base:
+//out_free_stack_base:
 	//for_each_possible_cpu(cpu)
 	//	free_page(per_cpu(kvm_arm_hyp_stack_page, cpu));
 out_err:

diff --git a/arch/arm64/boot/dts/exynos7870-a6lte_eur_open_00.dtb b/arch/arm64/boot/dts/exynos7870-a6lte_eur_open_00.dtb
diff --git a/arch/arm64/boot/dts/exynos7870-a6lte_eur_open_01.dtb b/arch/arm64/boot/dts/exynos7870-a6lte_eur_open_01.dtb
diff --git a/arch/arm64/boot/dts/exynos7870-a6lte_eur_open_02.dtb b/arch/arm64/boot/dts/exynos7870-a6lte_eur_open_02.dtb
diff --git a/arch/arm64/boot/dts/exynos7870-a6lte_eur_open_03.dtb b/arch/arm64/boot/dts/exynos7870-a6lte_eur_open_03.dtb
diff --git a/include/config/auto.conf b/include/config/auto.conf
@@ -45,9 +45,11 @@ CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_HID_SPEEDLINK=y
 CONFIG_TCP_CONG_HTCP=y
 CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_BINFMT_MISC=y
 CONFIG_NETFILTER_XT_MATCH_HELPER=y
 CONFIG_SSB_POSSIBLE=y
 CONFIG_EXYNOS_SNAPSHOT_CALLSTACK=4
+CONFIG_MMU_NOTIFIER=y
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
 CONFIG_UHID=y
@@ -196,6 +198,7 @@ CONFIG_NF_CONNTRACK_SANE=y
 CONFIG_FAT_VIRTUAL_XATTR=y
 CONFIG_NF_HISTORY=y
 CONFIG_HAVE_BPF_JIT=y
+CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_NF_CT_PROTO_DCCP=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ENCRYPTED_KEYS=y
@@ -249,7 +252,6 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_IP_NF_ARP_MANGLE=y
 CONFIG_CAMERA_FLASH_GPIO_OBJ=y
 CONFIG_HARDLOCKUP_DETECTOR_OTHER_CPU=y
-CONFIG_CC_STACKPROTECTOR_STRONG=y
 CONFIG_ION_EXYNOS_OF=y
 CONFIG_SEC_EVENT_LOG=y
 CONFIG_NF_CONNTRACK_PPTP=y
@@ -265,6 +267,7 @@ CONFIG_PANTHERLORD_FF=y
 CONFIG_BLOCK_SUPPORT_STLOG=y
 CONFIG_PM=y
 CONFIG_SPI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
 CONFIG_NF_CONNTRACK_IRC=y
 CONFIG_SWITCH=y
 CONFIG_SAMSUNG_PRODUCT_SHIP=y
@@ -360,6 +363,7 @@ CONFIG_RCU_FANOUT_LEAF=16
 CONFIG_BPF=y
 CONFIG_PHY_EXYNOS_MIPI_VIDEO=y
 CONFIG_NF_NAT_PROTO_DCCP=y
+CONFIG_KVM_ARM_VGIC=y
 CONFIG_SENSORS_A96T3X6=y
 CONFIG_CAMERA_EEPROM_SUPPORT_FRONT=y
 CONFIG_CONDITIONAL_SAFETY_TIMER=y
@@ -423,6 +427,7 @@ CONFIG_INET_TUNNEL=y
 CONFIG_PINCONF=y
 CONFIG_MMC_BLOCK_BOUNCE=y
 CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_KVM_ARM_MAX_VCPUS=4
 CONFIG_IOSCHED_CFQ=y
 CONFIG_OID_REGISTRY=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -563,7 +568,6 @@ CONFIG_IP_NF_MATCH_ECN=y
 CONFIG_USB_GADGET=y
 CONFIG_HARDLOCKUP_DETECTOR=y
 CONFIG_USB_HIDDEV=y
-CONFIG_TIMA_LKMAUTH=y
 CONFIG_SOUND=y
 CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
 CONFIG_AUDIT_WATCH=y
@@ -601,7 +605,6 @@ CONFIG_CRYPTO_SHA2_ARM64_CE=y
 CONFIG_KEYBOARD_ATKBD=y
 CONFIG_NET_IP_TUNNEL=y
 CONFIG_NF_NAT=y
-CONFIG_TIMA_LOG=y
 CONFIG_CPU_IDLE=y
 CONFIG_IP6_NF_MATCH_RPFILTER=y
 CONFIG_REGULATOR=y
@@ -713,7 +716,6 @@ CONFIG_MFD_SEC_CORE=y
 CONFIG_MUIC_S2MU005_JIGB_CONTROL=y
 CONFIG_PHY_SAMSUNG_USB_CAL=y
 CONFIG_CRYPTO_SHA1=y
-CONFIG_TIMA_RKP_4G=y
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_COMMON_CLK_XGENE=y
 CONFIG_USB_BELKIN=y
@@ -1057,6 +1059,7 @@ CONFIG_EXYNOS_CAMERA_MODULE=y
 CONFIG_KERNFS=y
 CONFIG_I2C_ALGOBIT=y
 CONFIG_MMC_BLOCK=y
+CONFIG_KVM=y
 CONFIG_SEC_NAD=y
 CONFIG_EXPERT=y
 CONFIG_MMC_DW_EXYNOS=y
@@ -1088,14 +1091,11 @@ CONFIG_WTL_ENCRYPTION_FILTER=y
 CONFIG_AUDIT_COMPAT_GENERIC=y
 CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG_32BIT=y
 CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
-CONFIG_UH_RKP=y
 CONFIG_DM_VERITY_HASH_PREFETCH_MIN_SIZE=1
-CONFIG_TIMA_RKP=y
 CONFIG_IPV6_VTI=y
 CONFIG_CRYPTO_DRBG=y
 CONFIG_SND_MAX_CARDS=32
 CONFIG_OF_EARLY_FLATTREE=y
-CONFIG_TIMA=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_NET_VENDOR_VIA=y
 CONFIG_HZ=100
@@ -1138,7 +1138,6 @@ CONFIG_NF_LOG_COMMON=y
 CONFIG_GPU_THERMAL=y
 CONFIG_NETFILTER_XT_MATCH_LIMIT=y
 CONFIG_FIMC_BNS_V4_10_0=y
-CONFIG_CC_STACKPROTECTOR=y
 CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_EXT2_FS_SECURITY=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
@@ -1150,6 +1149,7 @@ CONFIG_I2C_COMPAT=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SOC_EXYNOS7870=y
 CONFIG_ARM_GIC_V3=y
+CONFIG_VIRTUALIZATION=y
 CONFIG_MSDOS_PARTITION=y
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
@@ -1204,6 +1204,7 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_OF_MDIO=y
 CONFIG_BATTERY_AGE_FORECAST=y
 CONFIG_VIDEOBUF2_CORE=y
+CONFIG_KVM_ARM_HOST=y
 CONFIG_SENSORS_ET5XX=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_BASE_SMALL=0
@@ -1261,6 +1262,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA2=y
 CONFIG_HID_ELECOM=y
 CONFIG_SND_TIMER=y
 CONFIG_SEC_EXT=y
+CONFIG_KVM_MMIO=y
 CONFIG_CMA_PINPAGE_MIGRATION=y
 CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_BLK_DEV=y
@@ -1318,6 +1320,7 @@ CONFIG_INET6_XFRM_MODE_BEET=y
 CONFIG_ARM64=y
 CONFIG_PREEMPT=y
 CONFIG_FB_CFB_COPYAREA=y
+CONFIG_HAVE_KVM_IRQCHIP=y
 CONFIG_ARCH_HAS_TICK_BROADCAST=y
 CONFIG_EXYNOS_THERMAL=y
 CONFIG_CAMERA_MODULE_SELECT=y
@@ -1401,6 +1404,7 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_IP_NF_TARGET_REJECT=y
 CONFIG_SEC_NFC_IF_I2C=y
 CONFIG_LEDS_CLASS=y
+CONFIG_KVM_ARM_TIMER=y
 CONFIG_USB_NOTIFIER=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_DCACHE_WORD_ACCESS=y

diff --git a/include/config/auto.conf.cmd b/include/config/auto.conf.cmd
@@ -1072,7 +1072,7 @@ endif
 ifneq "$(ANDROID_MAJOR_VERSION)" "p"
 include/config/auto.conf: FORCE
 endif
-ifneq "$(ANDROID_VERSION)" "90000"
+ifneq "$(ANDROID_VERSION)" "990000"
 include/config/auto.conf: FORCE
 endif
 ifneq "$(SRCARCH)" "arm64"

diff --git a/include/config/binfmt/misc.h b/include/config/binfmt/misc.h
diff --git a/include/config/have/kvm/cpu/relax/intercept.h b/include/config/have/kvm/cpu/relax/intercept.h
diff --git a/include/config/have/kvm/irqchip.h b/include/config/have/kvm/irqchip.h
diff --git a/include/config/kernel.release b/include/config/kernel.release
@@ -0,0 +1 @@
+3.18.91-gb4ab23c0-dirty
diff --git a/include/config/kvm.h b/include/config/kvm.h
diff --git a/include/config/kvm/arm/host.h b/include/config/kvm/arm/host.h
diff --git a/include/config/kvm/arm/max/vcpus.h b/include/config/kvm/arm/max/vcpus.h
diff --git a/include/config/kvm/arm/timer.h b/include/config/kvm/arm/timer.h
diff --git a/include/config/kvm/arm/vgic.h b/include/config/kvm/arm/vgic.h
diff --git a/include/config/kvm/mmio.h b/include/config/kvm/mmio.h
diff --git a/include/config/mmu/notifier.h b/include/config/mmu/notifier.h
diff --git a/include/config/preempt/notifiers.h b/include/config/preempt/notifiers.h
diff --git a/include/config/tristate.conf b/include/config/tristate.conf
@@ -11,6 +11,7 @@ CONFIG_NF_CONNTRACK_NETBIOS_NS=Y
 CONFIG_RTC_DRV_SEC=Y
 CONFIG_HID_SPEEDLINK=Y
 CONFIG_TCP_CONG_HTCP=Y
+CONFIG_BINFMT_MISC=Y
 CONFIG_NETFILTER_XT_MATCH_HELPER=Y
 CONFIG_ASYMMETRIC_KEY_TYPE=Y
 CONFIG_NETFILTER_XT_MATCH_STATISTIC=Y
@@ -207,7 +208,6 @@ CONFIG_CRYPTO_SHA2_ARM64_CE=Y
 CONFIG_KEYBOARD_ATKBD=Y
 CONFIG_NET_IP_TUNNEL=Y
 CONFIG_NF_NAT=Y
-CONFIG_TIMA_LOG=Y
 CONFIG_IP6_NF_MATCH_RPFILTER=Y
 CONFIG_CRYPTO_HASH=Y
 CONFIG_CPU_FREQ_GOV_INTERACTIVE=Y

diff --git a/include/config/virtualization.h b/include/config/virtualization.h
diff --git a/include/generated/asm-offsets.h b/include/generated/asm-offsets.h
@@ -0,0 +1,137 @@
+#ifndef __ASM_OFFSETS_H__
+#define __ASM_OFFSETS_H__
+/*
+ * DO NOT MODIFY.
+ *
+ * This file was generated by Kbuild
+ *
+ */
+
+#define TSK_ACTIVE_MM 680 /* offsetof(struct task_struct, active_mm)	// */
+
+#define TI_FLAGS 0 /* offsetof(struct thread_info, flags)	// */
+#define TI_PREEMPT 32 /* offsetof(struct thread_info, preempt_count)	// */
+#define TI_ADDR_LIMIT 8 /* offsetof(struct thread_info, addr_limit)	// */
+#define TI_TASK 16 /* offsetof(struct thread_info, task)	// */
+#define TI_EXEC_DOMAIN 24 /* offsetof(struct thread_info, exec_domain)	// */
+#define TI_CPU 36 /* offsetof(struct thread_info, cpu)	// */
+
+#define THREAD_CPU_CONTEXT 1296 /* offsetof(struct task_struct, thread.cpu_context)	// */
+
+#define S_X0 0 /* offsetof(struct pt_regs, regs[0])	// */
+#define S_X1 8 /* offsetof(struct pt_regs, regs[1])	// */
+#define S_X2 16 /* offsetof(struct pt_regs, regs[2])	// */
+#define S_X3 24 /* offsetof(struct pt_regs, regs[3])	// */
+#define S_X4 32 /* offsetof(struct pt_regs, regs[4])	// */
+#define S_X5 40 /* offsetof(struct pt_regs, regs[5])	// */
+#define S_X6 48 /* offsetof(struct pt_regs, regs[6])	// */
+#define S_X7 56 /* offsetof(struct pt_regs, regs[7])	// */
+#define S_LR 240 /* offsetof(struct pt_regs, regs[30])	// */
+#define S_SP 248 /* offsetof(struct pt_regs, sp)	// */
+#define S_COMPAT_SP 104 /* offsetof(struct pt_regs, compat_sp)	// */
+#define S_PSTATE 264 /* offsetof(struct pt_regs, pstate)	// */
+#define S_PC 256 /* offsetof(struct pt_regs, pc)	// */
+#define S_ORIG_X0 272 /* offsetof(struct pt_regs, orig_x0)	// */
+#define S_SYSCALLNO 280 /* offsetof(struct pt_regs, syscallno)	// */
+#define S_ORIG_ADDR_LIMIT 288 /* offsetof(struct pt_regs, orig_addr_limit)	// */
+#define S_FRAME_SIZE 304 /* sizeof(struct pt_regs)	// */
+
+#define MM_CONTEXT_ID 688 /* offsetof(struct mm_struct, context.id.counter)	// */
+
+#define VMA_VM_MM 64 /* offsetof(struct vm_area_struct, vm_mm)	// */
+#define VMA_VM_FLAGS 80 /* offsetof(struct vm_area_struct, vm_flags)	// */
+
+#define VM_EXEC 4 /* VM_EXEC	// */
+
+#define PAGE_SZ 4096 /* PAGE_SIZE	// */
+
+#define DMA_BIDIRECTIONAL 0 /* DMA_BIDIRECTIONAL	// */
+#define DMA_TO_DEVICE 1 /* DMA_TO_DEVICE	// */
+#define DMA_FROM_DEVICE 2 /* DMA_FROM_DEVICE	// */
+
+#define CLOCK_REALTIME 0 /* CLOCK_REALTIME	// */
+#define CLOCK_MONOTONIC 1 /* CLOCK_MONOTONIC	// */
+#define CLOCK_MONOTONIC_RAW 4 /* CLOCK_MONOTONIC_RAW	// */
+#define CLOCK_REALTIME_RES 1 /* MONOTONIC_RES_NSEC	// */
+#define CLOCK_REALTIME_COARSE 5 /* CLOCK_REALTIME_COARSE	// */
+#define CLOCK_MONOTONIC_COARSE 6 /* CLOCK_MONOTONIC_COARSE	// */
+#define CLOCK_COARSE_RES 10000000 /* LOW_RES_NSEC	// */
+#define NSEC_PER_SEC 1000000000 /* NSEC_PER_SEC	// */
+
+#define VDSO_CS_CYCLE_LAST 0 /* offsetof(struct vdso_data, cs_cycle_last)	// */
+#define VDSO_RAW_TIME_SEC 8 /* offsetof(struct vdso_data, raw_time_sec)	// */
+#define VDSO_RAW_TIME_NSEC 16 /* offsetof(struct vdso_data, raw_time_nsec)	// */
+#define VDSO_XTIME_CLK_SEC 24 /* offsetof(struct vdso_data, xtime_clock_sec)	// */
+#define VDSO_XTIME_CLK_NSEC 32 /* offsetof(struct vdso_data, xtime_clock_nsec)	// */
+#define VDSO_XTIME_CRS_SEC 40 /* offsetof(struct vdso_data, xtime_coarse_sec)	// */
+#define VDSO_XTIME_CRS_NSEC 48 /* offsetof(struct vdso_data, xtime_coarse_nsec)	// */
+#define VDSO_WTM_CLK_SEC 56 /* offsetof(struct vdso_data, wtm_clock_sec)	// */
+#define VDSO_WTM_CLK_NSEC 64 /* offsetof(struct vdso_data, wtm_clock_nsec)	// */
+#define VDSO_TB_SEQ_COUNT 72 /* offsetof(struct vdso_data, tb_seq_count)	// */
+#define VDSO_CS_MONO_MULT 76 /* offsetof(struct vdso_data, cs_mono_mult)	// */
+#define VDSO_CS_RAW_MULT 84 /* offsetof(struct vdso_data, cs_raw_mult)	// */
+#define VDSO_CS_SHIFT 80 /* offsetof(struct vdso_data, cs_shift)	// */
+#define VDSO_TZ_MINWEST 88 /* offsetof(struct vdso_data, tz_minuteswest)	// */
+#define VDSO_TZ_DSTTIME 92 /* offsetof(struct vdso_data, tz_dsttime)	// */
+#define VDSO_USE_SYSCALL 96 /* offsetof(struct vdso_data, use_syscall)	// */
+
+#define TVAL_TV_SEC 0 /* offsetof(struct timeval, tv_sec)	// */
+#define TVAL_TV_USEC 8 /* offsetof(struct timeval, tv_usec)	// */
+#define TSPEC_TV_SEC 0 /* offsetof(struct timespec, tv_sec)	// */
+#define TSPEC_TV_NSEC 8 /* offsetof(struct timespec, tv_nsec)	// */
+
+#define TZ_MINWEST 0 /* offsetof(struct timezone, tz_minuteswest)	// */
+#define TZ_DSTTIME 4 /* offsetof(struct timezone, tz_dsttime)	// */
+
+#define VCPU_CONTEXT 256 /* offsetof(struct kvm_vcpu, arch.ctxt)	// */
+#define CPU_GP_REGS 0 /* offsetof(struct kvm_cpu_context, gp_regs)	// */
+#define CPU_USER_PT_REGS 0 /* offsetof(struct kvm_regs, regs)	// */
+#define CPU_FP_REGS 336 /* offsetof(struct kvm_regs, fp_regs)	// */
+#define CPU_SP_EL1 272 /* offsetof(struct kvm_regs, sp_el1)	// */
+#define CPU_ELR_EL1 280 /* offsetof(struct kvm_regs, elr_el1)	// */
+#define CPU_SPSR 288 /* offsetof(struct kvm_regs, spsr)	// */
+#define CPU_SYSREGS 864 /* offsetof(struct kvm_cpu_context, sys_regs)	// */
+#define VCPU_ESR_EL2 1880 /* offsetof(struct kvm_vcpu, arch.fault.esr_el2)	// */
+#define VCPU_FAR_EL2 1888 /* offsetof(struct kvm_vcpu, arch.fault.far_el2)	// */
+#define VCPU_HPFAR_EL2 1896 /* offsetof(struct kvm_vcpu, arch.fault.hpfar_el2)	// */
+#define VCPU_DEBUG_FLAGS 1904 /* offsetof(struct kvm_vcpu, arch.debug_flags)	// */
+#define VCPU_HCR_EL2 1872 /* offsetof(struct kvm_vcpu, arch.hcr_el2)	// */
+#define VCPU_IRQ_LINES 2408 /* offsetof(struct kvm_vcpu, arch.irq_lines)	// */
+#define VCPU_HOST_CONTEXT 1912 /* offsetof(struct kvm_vcpu, arch.host_cpu_context)	// */
+#define VCPU_TIMER_CNTV_CTL 2256 /* offsetof(struct kvm_vcpu, arch.timer_cpu.cntv_ctl)	// */
+#define VCPU_TIMER_CNTV_CVAL 2264 /* offsetof(struct kvm_vcpu, arch.timer_cpu.cntv_cval)	// */
+#define KVM_TIMER_CNTVOFF 816 /* offsetof(struct kvm, arch.timer.cntvoff)	// */
+#define KVM_TIMER_ENABLED 808 /* offsetof(struct kvm, arch.timer.enabled)	// */
+#define VCPU_KVM 0 /* offsetof(struct kvm_vcpu, kvm)	// */
+#define VCPU_VGIC_CPU 1920 /* offsetof(struct kvm_vcpu, arch.vgic_cpu)	// */
+#define VGIC_SAVE_FN 0 /* offsetof(struct vgic_sr_vectors, save_vgic)	// */
+#define VGIC_RESTORE_FN 8 /* offsetof(struct vgic_sr_vectors, restore_vgic)	// */
+#define VGIC_SR_VECTOR_SZ 16 /* sizeof(struct vgic_sr_vectors)	// */
+#define VGIC_V2_CPU_HCR 40 /* offsetof(struct vgic_cpu, vgic_v2.vgic_hcr)	// */
+#define VGIC_V2_CPU_VMCR 44 /* offsetof(struct vgic_cpu, vgic_v2.vgic_vmcr)	// */
+#define VGIC_V2_CPU_MISR 48 /* offsetof(struct vgic_cpu, vgic_v2.vgic_misr)	// */
+#define VGIC_V2_CPU_EISR 56 /* offsetof(struct vgic_cpu, vgic_v2.vgic_eisr)	// */
+#define VGIC_V2_CPU_ELRSR 64 /* offsetof(struct vgic_cpu, vgic_v2.vgic_elrsr)	// */
+#define VGIC_V2_CPU_APR 72 /* offsetof(struct vgic_cpu, vgic_v2.vgic_apr)	// */
+#define VGIC_V2_CPU_LR 76 /* offsetof(struct vgic_cpu, vgic_v2.vgic_lr)	// */
+#define VGIC_V3_CPU_HCR 40 /* offsetof(struct vgic_cpu, vgic_v3.vgic_hcr)	// */
+#define VGIC_V3_CPU_VMCR 44 /* offsetof(struct vgic_cpu, vgic_v3.vgic_vmcr)	// */
+#define VGIC_V3_CPU_MISR 48 /* offsetof(struct vgic_cpu, vgic_v3.vgic_misr)	// */
+#define VGIC_V3_CPU_EISR 52 /* offsetof(struct vgic_cpu, vgic_v3.vgic_eisr)	// */
+#define VGIC_V3_CPU_ELRSR 56 /* offsetof(struct vgic_cpu, vgic_v3.vgic_elrsr)	// */
+#define VGIC_V3_CPU_AP0R 60 /* offsetof(struct vgic_cpu, vgic_v3.vgic_ap0r)	// */
+#define VGIC_V3_CPU_AP1R 76 /* offsetof(struct vgic_cpu, vgic_v3.vgic_ap1r)	// */
+#define VGIC_V3_CPU_LR 96 /* offsetof(struct vgic_cpu, vgic_v3.vgic_lr)	// */
+#define VGIC_CPU_NR_LR 32 /* offsetof(struct vgic_cpu, nr_lr)	// */
+#define KVM_VTTBR 608 /* offsetof(struct kvm, arch.vttbr)	// */
+#define KVM_VGIC_VCTRL 632 /* offsetof(struct kvm, arch.vgic.vctrl_base)	// */
+#define CPU_SUSPEND_SZ 96 /* sizeof(struct cpu_suspend_ctx)	// */
+#define CPU_CTX_SP 88 /* offsetof(struct cpu_suspend_ctx, sp)	// */
+#define MPIDR_HASH_MASK 0 /* offsetof(struct mpidr_hash, mask)	// */
+#define MPIDR_HASH_SHIFTS 8 /* offsetof(struct mpidr_hash, shift_aff)	// */
+#define SLEEP_SAVE_SP_SZ 16 /* sizeof(struct sleep_save_sp)	// */
+#define SLEEP_SAVE_SP_PHYS 8 /* offsetof(struct sleep_save_sp, save_ptr_stash_phys)	// */
+#define SLEEP_SAVE_SP_VIRT 0 /* offsetof(struct sleep_save_sp, save_ptr_stash)	// */
+
+
+#endif