MIPS: vdso: Avoid name conflict around "vdso_data"

The generic vdso/datapage.h declares a symbol named "vdso_data".
Avoid a conflict by renaming the identically named variable in genvdso.c.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20241010-vdso-generic-base-v1-9-b64f0842d512@linutronix.de

diff --git a/arch/mips/vdso/genvdso.c b/arch/mips/vdso/genvdso.c
index 09e30eb4be8605581f9ea40b757dd4e576ed0c2a..d47412ea6e6736b8714f7db7e4cfe7c18bf12c04 100644 (file)
--- a/arch/mips/vdso/genvdso.c
+++ b/arch/mips/vdso/genvdso.c
@@ -270,7 +270,7 @@ int main(int argc, char **argv)
 
        /* Write out the stripped VDSO data. */
        fprintf(out_file,
-               "static unsigned char vdso_data[PAGE_ALIGN(%zu)] __page_aligned_data = {\n\t",
+               "static unsigned char vdso_image_data[PAGE_ALIGN(%zu)] __page_aligned_data = {\n\t",
                vdso_size);
        for (i = 0; i < vdso_size; i++) {
                if (!(i % 10))
@@ -286,7 +286,7 @@ int main(int argc, char **argv)
 
        fprintf(out_file, "struct mips_vdso_image vdso_image%s%s = {\n",
                (vdso_name[0]) ? "_" : "", vdso_name);
-       fprintf(out_file, "\t.data = vdso_data,\n");
+       fprintf(out_file, "\t.data = vdso_image_data,\n");
        fprintf(out_file, "\t.size = PAGE_ALIGN(%zu),\n", vdso_size);
        fprintf(out_file, "\t.mapping = {\n");
        fprintf(out_file, "\t\t.name = \"[vdso]\",\n");