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

Message ID 170845946510.398.15647064695423653588.tip-bot2@tip-bot2
State New
Headers
Series [tip:,timers/core] csky/vdso: Use generic union vdso_data_store |

Commit Message

tip-bot2 for Thomas Gleixner Feb. 20, 2024, 8:04 p.m. UTC
  The following commit has been merged into the timers/core branch of tip:

Commit-ID:     56145a0f84e8862aeb3b36d6e21349bb4dd64269
Gitweb:        https://git.kernel.org/tip/56145a0f84e8862aeb3b36d6e21349bb4dd64269
Author:        Anna-Maria Behnsen <anna-maria@linutronix.de>
AuthorDate:    Mon, 19 Feb 2024 16:39:39 +01:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Tue, 20 Feb 2024 20:56:01 +01:00

csky/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@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Acked-by: Guo Ren <guoren@kernel.org>
Link: https://lore.kernel.org/r/20240219153939.75719-11-anna-maria@linutronix.de
---
 arch/csky/kernel/vdso.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
  

Patch

diff --git a/arch/csky/kernel/vdso.c b/arch/csky/kernel/vdso.c
index e74a250..2ca886e 100644
--- a/arch/csky/kernel/vdso.c
+++ b/arch/csky/kernel/vdso.c
@@ -15,14 +15,8 @@  extern char vdso_start[], vdso_end[];
 static unsigned int vdso_pages;
 static struct page **vdso_pagelist;
 
-/*
- * 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;
 
 static int __init vdso_init(void)
 {