mips: Add support for generic vDSO

The mips vDSO library requires some adaptations to take advantage of the
newly introduced generic vDSO library.

Introduce the following changes:
 - Modification of vdso.c to be compliant with the common vdso datapage
 - Use of lib/vdso for gettimeofday

Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paul Burton <paul.burton@mips.com>
Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
[paul.burton@mips.com: Prepend $(src) to config-n32-o32-env.c path.]
Signed-off-by: Paul Burton <paul.burton@mips.com>

1 files changed, 6 insertions, 31 deletions

diff --git a/arch/mips/kernel/vdso.c b/arch/mips/kernel/vdso.c
index 3a372686ffca..bc35f8499111 100644
--- a/arch/mips/kernel/vdso.c
+++ b/arch/mips/kernel/vdso.c
@@ -20,9 +20,12 @@
 #include <asm/mips-cps.h>
 #include <asm/page.h>
 #include <asm/vdso.h>
+#include <vdso/helpers.h>
+#include <vdso/vsyscall.h>
 
 /* Kernel-provided data used by the VDSO. */
-static union mips_vdso_data vdso_data __page_aligned_data;
+static union mips_vdso_data mips_vdso_data __page_aligned_data;
+struct vdso_data *vdso_data = mips_vdso_data.data;
 
 /*
  * Mapping for the VDSO data/GIC pages. The real pages are mapped manually, as
@@ -66,34 +69,6 @@ static int __init init_vdso(void)
 }
 subsys_initcall(init_vdso);
 
-void update_vsyscall(struct timekeeper *tk)
-{
-        vdso_data_write_begin(&vdso_data);
-
-        vdso_data.xtime_sec = tk->xtime_sec;
-        vdso_data.xtime_nsec = tk->tkr_mono.xtime_nsec;
-        vdso_data.wall_to_mono_sec = tk->wall_to_monotonic.tv_sec;
-        vdso_data.wall_to_mono_nsec = tk->wall_to_monotonic.tv_nsec;
-        vdso_data.cs_shift = tk->tkr_mono.shift;
-
-        vdso_data.clock_mode = tk->tkr_mono.clock->archdata.vdso_clock_mode;
-        if (vdso_data.clock_mode != VDSO_CLOCK_NONE) {
-                vdso_data.cs_mult = tk->tkr_mono.mult;
-                vdso_data.cs_cycle_last = tk->tkr_mono.cycle_last;
-                vdso_data.cs_mask = tk->tkr_mono.mask;
-        }
-
-        vdso_data_write_end(&vdso_data);
-}
-
-void update_vsyscall_tz(void)
-{
-        if (vdso_data.clock_mode != VDSO_CLOCK_NONE) {
-                vdso_data.tz_minuteswest = sys_tz.tz_minuteswest;
-                vdso_data.tz_dsttime = sys_tz.tz_dsttime;
-        }
-}
-
 static unsigned long vdso_base(void)
 {
         unsigned long base;
@@ -163,7 +138,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
          */
         if (cpu_has_dc_aliases) {
                 base = __ALIGN_MASK(base, shm_align_mask);
-                base += ((unsigned long)&vdso_data - gic_size) & shm_align_mask;
+                base += ((unsigned long)vdso_data - gic_size) & shm_align_mask;
         }
 
         data_addr = base + gic_size;
@@ -189,7 +164,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
 
         /* Map data page. */
         ret = remap_pfn_range(vma, data_addr,
-                              virt_to_phys(&vdso_data) >> PAGE_SHIFT,
+                              virt_to_phys(vdso_data) >> PAGE_SHIFT,
                               PAGE_SIZE, PAGE_READONLY);
         if (ret)
                 goto out;