Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 435c9b11 authored by Catalin Marinas's avatar Catalin Marinas Committed by Lee Jones
Browse files

BACKPORT: arm64: vdso: Remove unnecessary asm-offsets.c definitions 



Since the VDSO code has moved to C from assembly, there is no need to
define and maintain the corresponding asm offsets.

Bug: 254441685
Fixes: 28b1a824a4f4 ("arm64: vdso: Substitute gettimeofday() with C implementation")
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: linux-arch@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mips@vger.kernel.org
Cc: linux-kselftest@vger.kernel.org
Cc: Will Deacon <will.deacon@arm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paul Burton <paul.burton@mips.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Mark Salyzyn <salyzyn@android.com>
Cc: Peter Collingbourne <pcc@google.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Dmitry Safonov <0x7f454c46@gmail.com>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Huw Davies <huw@codeweavers.com>
Cc: Shijith Thotton <sthotton@marvell.com>
Cc: Andre Przywara <andre.przywara@arm.com>
Link: https://lkml.kernel.org/r/20190624135812.GC29120@arrakis.emea.arm.com



(cherry picked from commit 94fee4d43752b6022428d9de402632904968e15b)
Signed-off-by: default avatarLee Jones <joneslee@google.com>
Change-Id: Ie511ac25edda3a83d3b2570b109fde26d6019dbc
parent e252585d

arch/arm64/kernel/asm-offsets.c

+0 −41
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/kvm_host.h>

#include <linux/preempt.h>

#include <linux/suspend.h>

#include <vdso/datapage.h>

#include <asm/cpufeature.h>

#include <asm/fixmap.h>

#include <asm/thread_info.h>
@@ -105,46 +104,6 @@ int main(void) 
  BLANK();

  DEFINE(PREEMPT_DISABLE_OFFSET, PREEMPT_DISABLE_OFFSET);

  BLANK();

  DEFINE(CLOCK_REALTIME,	CLOCK_REALTIME);

  DEFINE(CLOCK_MONOTONIC,	CLOCK_MONOTONIC);

  DEFINE(CLOCK_MONOTONIC_RAW,	CLOCK_MONOTONIC_RAW);

  DEFINE(CLOCK_REALTIME_RES,	offsetof(struct vdso_data, hrtimer_res));

  DEFINE(CLOCK_REALTIME_COARSE,	CLOCK_REALTIME_COARSE);

  DEFINE(CLOCK_MONOTONIC_COARSE,CLOCK_MONOTONIC_COARSE);

  DEFINE(CLOCK_COARSE_RES,	LOW_RES_NSEC);

  DEFINE(NSEC_PER_SEC,		NSEC_PER_SEC);

  BLANK();

  DEFINE(VDSO_SEQ,		offsetof(struct vdso_data, seq));

  DEFINE(VDSO_CLK_MODE,		offsetof(struct vdso_data, clock_mode));

  DEFINE(VDSO_CYCLE_LAST,	offsetof(struct vdso_data, cycle_last));

  DEFINE(VDSO_MASK,		offsetof(struct vdso_data, mask));

  DEFINE(VDSO_MULT,		offsetof(struct vdso_data, mult));

  DEFINE(VDSO_SHIFT,		offsetof(struct vdso_data, shift));

  DEFINE(VDSO_REALTIME_SEC,	offsetof(struct vdso_data, basetime[CLOCK_REALTIME].sec));

  DEFINE(VDSO_REALTIME_NSEC,	offsetof(struct vdso_data, basetime[CLOCK_REALTIME].nsec));

  DEFINE(VDSO_MONO_SEC,		offsetof(struct vdso_data, basetime[CLOCK_MONOTONIC].sec));

  DEFINE(VDSO_MONO_NSEC,	offsetof(struct vdso_data, basetime[CLOCK_MONOTONIC].nsec));

  DEFINE(VDSO_MONO_RAW_SEC,	offsetof(struct vdso_data, basetime[CLOCK_MONOTONIC_RAW].sec));

  DEFINE(VDSO_MONO_RAW_NSEC,	offsetof(struct vdso_data, basetime[CLOCK_MONOTONIC_RAW].nsec));

  DEFINE(VDSO_BOOTTIME_SEC,	offsetof(struct vdso_data, basetime[CLOCK_BOOTTIME].sec));

  DEFINE(VDSO_BOOTTIME_NSEC,	offsetof(struct vdso_data, basetime[CLOCK_BOOTTIME].nsec));

  DEFINE(VDSO_TAI_SEC,		offsetof(struct vdso_data, basetime[CLOCK_TAI].sec));

  DEFINE(VDSO_TAI_NSEC,		offsetof(struct vdso_data, basetime[CLOCK_TAI].nsec));

  DEFINE(VDSO_RT_COARSE_SEC,	offsetof(struct vdso_data, basetime[CLOCK_REALTIME_COARSE].sec));

  DEFINE(VDSO_RT_COARSE_NSEC,	offsetof(struct vdso_data, basetime[CLOCK_REALTIME_COARSE].nsec));

  DEFINE(VDSO_MONO_COARSE_SEC,	offsetof(struct vdso_data, basetime[CLOCK_MONOTONIC_COARSE].sec));

  DEFINE(VDSO_MONO_COARSE_NSEC,	offsetof(struct vdso_data, basetime[CLOCK_MONOTONIC_COARSE].nsec));

  DEFINE(VDSO_TZ_MINWEST,	offsetof(struct vdso_data, tz_minuteswest));

  DEFINE(VDSO_TZ_DSTTIME,	offsetof(struct vdso_data, tz_dsttime));

  BLANK();

  DEFINE(TVAL_TV_SEC,		offsetof(struct timeval, tv_sec));

  DEFINE(TVAL_TV_USEC,		offsetof(struct timeval, tv_usec));

  DEFINE(TSPEC_TV_SEC,		offsetof(struct timespec, tv_sec));

  DEFINE(TSPEC_TV_NSEC,		offsetof(struct timespec, tv_nsec));

  BLANK();

  DEFINE(TZ_MINWEST,		offsetof(struct timezone, tz_minuteswest));

  DEFINE(TZ_DSTTIME,		offsetof(struct timezone, tz_dsttime));

  BLANK();

  DEFINE(CPU_BOOT_STACK,	offsetof(struct secondary_data, stack));

  DEFINE(CPU_BOOT_TASK,		offsetof(struct secondary_data, task));

  BLANK();