[tip: timers/core] arm64: vdso: Include common headers in the vdso library

From: tip-bot2 for Vincenzo Frascino
Date: Sat Mar 21 2020 - 10:34:40 EST


The following commit has been merged into the timers/core branch of tip:

Commit-ID: 60ad903e9477a832e4575734540db32023a605e9
Gitweb: https://git.kernel.org/tip/60ad903e9477a832e4575734540db32023a605e9
Author: Vincenzo Frascino <vincenzo.frascino@xxxxxxx>
AuthorDate: Fri, 20 Mar 2020 14:53:45
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Sat, 21 Mar 2020 15:24:01 +01:00

arm64: vdso: Include common headers in the vdso library

The vDSO library should only include the necessary headers required for
a userspace library (UAPI and a minimal set of kernel headers). To make
this possible it is necessary to isolate from the kernel headers the
common parts that are strictly necessary to build the library.

Refactor the vdso implementation to include common headers.

Signed-off-by: Vincenzo Frascino <vincenzo.frascino@xxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Cc: Will Deacon <will@xxxxxxxxxx>
Link: https://lkml.kernel.org/r/20200320145351.32292-21-vincenzo.frascino@xxxxxxx

---
arch/arm64/include/asm/vdso/gettimeofday.h | 1 -
arch/arm64/kernel/vdso/vgettimeofday.c | 2 --
2 files changed, 3 deletions(-)

diff --git a/arch/arm64/include/asm/vdso/gettimeofday.h b/arch/arm64/include/asm/vdso/gettimeofday.h
index 5a53443..afba6ba 100644
--- a/arch/arm64/include/asm/vdso/gettimeofday.h
+++ b/arch/arm64/include/asm/vdso/gettimeofday.h
@@ -8,7 +8,6 @@
#ifndef __ASSEMBLY__

#include <asm/unistd.h>
-#include <uapi/linux/time.h>

#define VDSO_HAS_CLOCK_GETRES 1

diff --git a/arch/arm64/kernel/vdso/vgettimeofday.c b/arch/arm64/kernel/vdso/vgettimeofday.c
index 7476355..4236cf3 100644
--- a/arch/arm64/kernel/vdso/vgettimeofday.c
+++ b/arch/arm64/kernel/vdso/vgettimeofday.c
@@ -5,8 +5,6 @@
* Copyright (C) 2018 ARM Limited
*
*/
-#include <linux/time.h>
-#include <linux/types.h>

int __kernel_clock_gettime(clockid_t clock,
struct __kernel_timespec *ts)