[tip: timers/core] riscv: vdso: Use generic union vdso_data_store

From: tip-bot2 for Anna-Maria Behnsen
Date: Tue Feb 20 2024 - 15:05:20 EST


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

Commit-ID: eba755314fa7bcb147193f51a44546697f3888f1
Gitweb: https://git.kernel.org/tip/eba755314fa7bcb147193f51a44546697f3888f1
Author: Anna-Maria Behnsen <anna-maria@xxxxxxxxxxxxx>
AuthorDate: Tue, 20 Feb 2024 09:52:12 +01:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Tue, 20 Feb 2024 20:56:00 +01:00

riscv: vdso: Use generic union vdso_data_store

There is already a generic union definition for vdso_data_store in the vdso
datapage header.

Use this definition to prevent code duplication.

Signed-off-by: Anna-Maria Behnsen <anna-maria@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20240220085212.6547-1-anna-maria@xxxxxxxxxxxxx

---
arch/riscv/kernel/vdso.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/arch/riscv/kernel/vdso.c b/arch/riscv/kernel/vdso.c
index 2cf7621..98315b9 100644
--- a/arch/riscv/kernel/vdso.c
+++ b/arch/riscv/kernel/vdso.c
@@ -30,14 +30,8 @@ enum rv_vdso_map {

#define VVAR_SIZE (VVAR_NR_PAGES << PAGE_SHIFT)

-/*
- * The vDSO data page.
- */
-static union {
- struct vdso_data data;
- u8 page[PAGE_SIZE];
-} vdso_data_store __page_aligned_data;
-struct vdso_data *vdso_data = &vdso_data_store.data;
+static union vdso_data_store vdso_data_store __page_aligned_data;
+struct vdso_data *vdso_data = vdso_data_store.data;

struct __vdso_info {
const char *name;