OSDN Git Service

arm64: vdso32: Code clean up
authorVincenzo Frascino <vincenzo.frascino@arm.com>
Fri, 20 Mar 2020 14:53:43 +0000 (14:53 +0000)
committerThomas Gleixner <tglx@linutronix.de>
Sat, 21 Mar 2020 14:24:00 +0000 (15:24 +0100)
The compat vdso library had some checks that are not anymore relevant.

Remove the unused code from the compat vDSO library.

Note: This patch is preparatory for a future one that will introduce
asm/vdso/processor.h on arm64.

Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/lkml/20200317122220.30393-19-vincenzo.frascino@arm.com
Link: https://lkml.kernel.org/r/20200320145351.32292-19-vincenzo.frascino@arm.com
arch/arm64/include/asm/vdso/compat_gettimeofday.h
arch/arm64/kernel/vdso32/vgettimeofday.c

index 81b0c39..401df2b 100644 (file)
@@ -76,10 +76,6 @@ int clock_getres_fallback(clockid_t _clkid, struct __kernel_timespec *_ts)
        register long ret asm ("r0");
        register long nr asm("r7") = __NR_compat_clock_getres_time64;
 
-       /* The checks below are required for ABI consistency with arm */
-       if ((_clkid >= MAX_CLOCKS) && (_ts == NULL))
-               return -EINVAL;
-
        asm volatile(
        "       swi #0\n"
        : "=r" (ret)
@@ -97,10 +93,6 @@ int clock_getres32_fallback(clockid_t _clkid, struct old_timespec32 *_ts)
        register long ret asm ("r0");
        register long nr asm("r7") = __NR_compat_clock_getres;
 
-       /* The checks below are required for ABI consistency with arm */
-       if ((_clkid >= MAX_CLOCKS) && (_ts == NULL))
-               return -EINVAL;
-
        asm volatile(
        "       swi #0\n"
        : "=r" (ret)
index 54fc1c2..ddbad47 100644 (file)
 int __vdso_clock_gettime(clockid_t clock,
                         struct old_timespec32 *ts)
 {
-       /* The checks below are required for ABI consistency with arm */
-       if ((u32)ts >= TASK_SIZE_32)
-               return -EFAULT;
-
        return __cvdso_clock_gettime32(clock, ts);
 }
 
 int __vdso_clock_gettime64(clockid_t clock,
                           struct __kernel_timespec *ts)
 {
-       /* The checks below are required for ABI consistency with arm */
-       if ((u32)ts >= TASK_SIZE_32)
-               return -EFAULT;
-
        return __cvdso_clock_gettime(clock, ts);
 }
 
@@ -37,10 +29,6 @@ int __vdso_gettimeofday(struct __kernel_old_timeval *tv,
 int __vdso_clock_getres(clockid_t clock_id,
                        struct old_timespec32 *res)
 {
-       /* The checks below are required for ABI consistency with arm */
-       if ((u32)res >= TASK_SIZE_32)
-               return -EFAULT;
-
        return __cvdso_clock_getres_time32(clock_id, res);
 }