diff options
| author | Thomas Weißschuh <thomas.weissschuh@linutronix.de> | 2024-10-10 09:01:11 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2024-11-02 12:37:33 +0100 |
| commit | c9b5482d0e726826034fd6e2302d7458e685d2cb (patch) | |
| tree | 1de888b5e5da25524b67ad54694acbe65f2c1f37 /arch/mips | |
| parent | LoongArch: vDSO: Use vdso/datapage.h to access vDSO data (diff) | |
| download | linux-c9b5482d0e726826034fd6e2302d7458e685d2cb.tar.xz linux-c9b5482d0e726826034fd6e2302d7458e685d2cb.zip | |
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
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/vdso/genvdso.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/vdso/genvdso.c b/arch/mips/vdso/genvdso.c index 09e30eb4be86..d47412ea6e67 100644 --- 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"); |