[SRU][F/aws][PATCH v3 1/6] Revert "UBUNTU: SAUCE: aws: kvm: double the size of hv_clock_boot"

Andrea Righi andrea.righi at canonical.com
Wed May 19 15:15:08 UTC 2021


BugLink: https://bugs.launchpad.net/bugs/1920944

This reverts commit b797d49573059dd6df7b929fa4b3eb7d02d6859e.

Replace temporary workaround with a new patch set that addresses the
problem in a better way (see next commits).

Signed-off-by: Andrea Righi <andrea.righi at canonical.com>
---
 arch/x86/kernel/kvmclock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
index 4466df2b0fed..904494b924c1 100644
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@ -46,7 +46,7 @@ early_param("no-kvmclock-vsyscall", parse_no_kvmclock_vsyscall);
 /* Aligned to page sizes to match whats mapped via vsyscalls to userspace */
 #define HV_CLOCK_SIZE	(sizeof(struct pvclock_vsyscall_time_info) * NR_CPUS)
 #define HVC_BOOT_ARRAY_SIZE \
-	((PAGE_SIZE * 2)/ sizeof(struct pvclock_vsyscall_time_info))
+	(PAGE_SIZE / sizeof(struct pvclock_vsyscall_time_info))
 
 static struct pvclock_vsyscall_time_info
 			hv_clock_boot[HVC_BOOT_ARRAY_SIZE] __bss_decrypted __aligned(PAGE_SIZE);
-- 
2.31.1




More information about the kernel-team mailing list