1 files changed, 9 insertions, 3 deletions

diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c
index 97bc68f4c689..3b8acfae7797 100644
--- a/arch/arm64/kernel/vdso.c
+++ b/arch/arm64/kernel/vdso.c
@@ -55,7 +55,7 @@ struct vdso_data *vdso_data = &vdso_data_store.data;
  */
 static struct page *vectors_page[1];
 
-static int alloc_vectors_page(void)
+static int __init alloc_vectors_page(void)
 {
         extern char __kuser_helper_start[], __kuser_helper_end[];
         extern char __aarch32_sigret_code_start[], __aarch32_sigret_code_end[];
@@ -88,7 +88,7 @@ int aarch32_setup_vectors_page(struct linux_binprm *bprm, int uses_interp)
 {
         struct mm_struct *mm = current->mm;
         unsigned long addr = AARCH32_VECTORS_BASE;
-        static struct vm_special_mapping spec = {
+        static const struct vm_special_mapping spec = {
                 .name   = "[vectors]",
                 .pages  = vectors_page,
 
@@ -212,10 +212,16 @@ void update_vsyscall(struct timekeeper *tk)
         vdso_data->wtm_clock_nsec               = tk->wall_to_monotonic.tv_nsec;
 
         if (!use_syscall) {
+                /* tkr_mono.cycle_last == tkr_raw.cycle_last */
                 vdso_data->cs_cycle_last        = tk->tkr_mono.cycle_last;
+                vdso_data->raw_time_sec         = tk->raw_time.tv_sec;
+                vdso_data->raw_time_nsec        = tk->raw_time.tv_nsec;
                 vdso_data->xtime_clock_sec      = tk->xtime_sec;
                 vdso_data->xtime_clock_nsec     = tk->tkr_mono.xtime_nsec;
-                vdso_data->cs_mult              = tk->tkr_mono.mult;
+                /* tkr_raw.xtime_nsec == 0 */
+                vdso_data->cs_mono_mult         = tk->tkr_mono.mult;
+                vdso_data->cs_raw_mult          = tk->tkr_raw.mult;
+                /* tkr_mono.shift == tkr_raw.shift */
                 vdso_data->cs_shift             = tk->tkr_mono.shift;
         }