From cb3444cfdb48b7ee7d208d19c97a29dd8252d884 Mon Sep 17 00:00:00 2001 From: Anna-Maria Behnsen Date: Mon, 19 Feb 2024 16:39:36 +0100 Subject: [PATCH] s390/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 Signed-off-by: Thomas Gleixner Reviewed-by: Vincenzo Frascino Reviewed-by: Kees Cook Acked-by: Heiko Carstens Link: https://lore.kernel.org/r/20240219153939.75719-8-anna-maria@linutronix.de --- arch/s390/kernel/vdso.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/s390/kernel/vdso.c b/arch/s390/kernel/vdso.c index bbaefd84f15e4..a45b3a4c91db0 100644 --- a/arch/s390/kernel/vdso.c +++ b/arch/s390/kernel/vdso.c @@ -25,10 +25,7 @@ extern char vdso32_start[], vdso32_end[]; static struct vm_special_mapping vvar_mapping; -static union { - struct vdso_data data[CS_BASES]; - u8 page[PAGE_SIZE]; -} vdso_data_store __page_aligned_data; +static union vdso_data_store vdso_data_store __page_aligned_data; struct vdso_data *vdso_data = vdso_data_store.data; -- 2.30.2