From 7298d8e1792ccc354a76d6c9eda364e4bd0feea2 Mon Sep 17 00:00:00 2001 From: NAKAMURA Gou Date: Mon, 11 Apr 2016 21:57:18 +0900 Subject: [PATCH] vdso: correct pvti array element type struct pvclock_vsyscall_time_info <-- struct pvclock_vcpu_time_info --- arch/x86/kernel/cpu.c | 2 +- lib/include/ihk/cpu.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/cpu.c b/arch/x86/kernel/cpu.c index c9de0a18..3dc9bcfd 100644 --- a/arch/x86/kernel/cpu.c +++ b/arch/x86/kernel/cpu.c @@ -148,7 +148,7 @@ uint64_t boot_pat_state = 0; int no_turbo = 0; /* May be updated by early parsing of kargs */ extern int num_processors; /* kernel/ap.c */ -struct pvclock_vcpu_time_info *pvti = NULL; +struct pvclock_vsyscall_time_info *pvti = NULL; int pvti_npages; static long pvti_msr = -1; diff --git a/lib/include/ihk/cpu.h b/lib/include/ihk/cpu.h index 2bf02b18..68d2bdea 100644 --- a/lib/include/ihk/cpu.h +++ b/lib/include/ihk/cpu.h @@ -111,11 +111,11 @@ void init_tick(void); void init_delay(void); void sync_tick(void); -struct pvclock_vcpu_time_info { - long contents[32/sizeof(long)]; +struct pvclock_vsyscall_time_info { + long contents[64/sizeof(long)]; }; -extern struct pvclock_vcpu_time_info *pvti; +extern struct pvclock_vsyscall_time_info *pvti; extern int pvti_npages; int arch_setup_pvclock(void);