[tip: timers/core] mips: Introduce asm/vdso/clocksource.h

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


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

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

mips: Introduce asm/vdso/clocksource.h

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.

Introduce asm/vdso/clocksource.h to contain all the arm64 specific
functions that are suitable for vDSO inclusion.

This header will be required by a future patch that will generalize
vdso/clocksource.h.

Signed-off-by: Vincenzo Frascino <vincenzo.frascino@xxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Paul Burton <paulburton@xxxxxxxxxx>
Link: https://lkml.kernel.org/r/20200320145351.32292-8-vincenzo.frascino@xxxxxxx

---
arch/mips/include/asm/clocksource.h | 4 +---
arch/mips/include/asm/vdso/clocksource.h | 9 +++++++++
2 files changed, 10 insertions(+), 3 deletions(-)
create mode 100644 arch/mips/include/asm/vdso/clocksource.h

diff --git a/arch/mips/include/asm/clocksource.h b/arch/mips/include/asm/clocksource.h
index de659ca..2f1ebbe 100644
--- a/arch/mips/include/asm/clocksource.h
+++ b/arch/mips/include/asm/clocksource.h
@@ -6,8 +6,6 @@
#ifndef __ASM_CLOCKSOURCE_H
#define __ASM_CLOCKSOURCE_H

-#define VDSO_ARCH_CLOCKMODES \
- VDSO_CLOCKMODE_R4K, \
- VDSO_CLOCKMODE_GIC
+#include <asm/vdso/clocksource.h>

#endif /* __ASM_CLOCKSOURCE_H */
diff --git a/arch/mips/include/asm/vdso/clocksource.h b/arch/mips/include/asm/vdso/clocksource.h
new file mode 100644
index 0000000..510e167
--- /dev/null
+++ b/arch/mips/include/asm/vdso/clocksource.h
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+#ifndef __ASM_VDSOCLOCKSOURCE_H
+#define __ASM_VDSOCLOCKSOURCE_H
+
+#define VDSO_ARCH_CLOCKMODES \
+ VDSO_CLOCKMODE_R4K, \
+ VDSO_CLOCKMODE_GIC
+
+#endif /* __ASM_VDSOCLOCKSOURCE_H */