[tip: timers/vdso] sparc64: vdso2c: Drop sym_vvar_start handling

From: tip-bot2 for Thomas Weißschuh

Date: Wed Mar 11 2026 - 06:13:42 EST


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

Commit-ID: fb57f3e7d5dc2c9ea195c5a7774412b6ffaf276d
Gitweb: https://git.kernel.org/tip/fb57f3e7d5dc2c9ea195c5a7774412b6ffaf276d
Author: Thomas Weißschuh <thomas.weissschuh@xxxxxxxxxxxxx>
AuthorDate: Wed, 04 Mar 2026 08:49:08 +01:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxx>
CommitterDate: Wed, 11 Mar 2026 10:18:32 +01:00

sparc64: vdso2c: Drop sym_vvar_start handling

After the adoption of the generic vDSO library this symbol does not exist.

The alignment invariant is now guaranteed by the generic code.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxx>
Tested-by: Andreas Larsson <andreas@xxxxxxxxxxx>
Reviewed-by: Andreas Larsson <andreas@xxxxxxxxxxx>
Acked-by: Andreas Larsson <andreas@xxxxxxxxxxx>
Link: https://patch.msgid.link/20260304-vdso-sparc64-generic-2-v6-11-d8eb3b0e1410@xxxxxxxxxxxxx
---
arch/sparc/include/asm/vdso.h | 2 --
arch/sparc/vdso/vdso2c.c | 6 ------
arch/sparc/vdso/vdso2c.h | 4 ----
3 files changed, 12 deletions(-)

diff --git a/arch/sparc/include/asm/vdso.h b/arch/sparc/include/asm/vdso.h
index 59e79d3..f08562d 100644
--- a/arch/sparc/include/asm/vdso.h
+++ b/arch/sparc/include/asm/vdso.h
@@ -8,8 +8,6 @@
struct vdso_image {
void *data;
unsigned long size; /* Always a multiple of PAGE_SIZE */
-
- long sym_vvar_start; /* Negative offset to the vvar area */
};

#ifdef CONFIG_SPARC64
diff --git a/arch/sparc/vdso/vdso2c.c b/arch/sparc/vdso/vdso2c.c
index b97af5e..70b14a4 100644
--- a/arch/sparc/vdso/vdso2c.c
+++ b/arch/sparc/vdso/vdso2c.c
@@ -58,18 +58,12 @@

const char *outfilename;

-/* Symbols that we need in vdso2c. */
-enum {
- sym_vvar_start,
-};
-
struct vdso_sym {
const char *name;
int export;
};

struct vdso_sym required_syms[] = {
- [sym_vvar_start] = {"vvar_start", 1},
};

__attribute__((format(printf, 1, 2))) __attribute__((noreturn))
diff --git a/arch/sparc/vdso/vdso2c.h b/arch/sparc/vdso/vdso2c.h
index 60d69ac..ba07946 100644
--- a/arch/sparc/vdso/vdso2c.h
+++ b/arch/sparc/vdso/vdso2c.h
@@ -104,10 +104,6 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
}
}

- /* Validate mapping addresses. */
- if (syms[sym_vvar_start] % 8192)
- fail("vvar_begin must be a multiple of 8192\n");
-
if (!name) {
fwrite(stripped_addr, stripped_len, 1, outfile);
return;