Commit 94d0f5be authored by Vincenzo Frascino's avatar Vincenzo Frascino Committed by Thomas Gleixner
Browse files

arm64: vdso32: Code clean up 



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: default avatarVincenzo Frascino <vincenzo.frascino@arm.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarCatalin 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
parent b5580517

arch/arm64/include/asm/vdso/compat_gettimeofday.h

+0 −8
Original line number Diff line number Diff line
@@ -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)

arch/arm64/kernel/vdso32/vgettimeofday.c

+0 −12
Original line number Diff line number Diff line
@@ -11,20 +11,12 @@ 
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);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE