Skip to content

Commit c9b5482

Browse files
t-8chKAGA-KOKO
authored andcommitted
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 <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Link: https://lore.kernel.org/all/[email protected]
1 parent dc32cb4 commit c9b5482

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/mips/vdso/genvdso.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ int main(int argc, char **argv)
270270

271271
/* Write out the stripped VDSO data. */
272272
fprintf(out_file,
273-
"static unsigned char vdso_data[PAGE_ALIGN(%zu)] __page_aligned_data = {\n\t",
273+
"static unsigned char vdso_image_data[PAGE_ALIGN(%zu)] __page_aligned_data = {\n\t",
274274
vdso_size);
275275
for (i = 0; i < vdso_size; i++) {
276276
if (!(i % 10))
@@ -286,7 +286,7 @@ int main(int argc, char **argv)
286286

287287
fprintf(out_file, "struct mips_vdso_image vdso_image%s%s = {\n",
288288
(vdso_name[0]) ? "_" : "", vdso_name);
289-
fprintf(out_file, "\t.data = vdso_data,\n");
289+
fprintf(out_file, "\t.data = vdso_image_data,\n");
290290
fprintf(out_file, "\t.size = PAGE_ALIGN(%zu),\n", vdso_size);
291291
fprintf(out_file, "\t.mapping = {\n");
292292
fprintf(out_file, "\t\t.name = \"[vdso]\",\n");

0 commit comments

Comments
 (0)