xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/vdso: Rename variable to fix -Wshadow warning

Browse Source 
The go32() and go64() functions has an argument and a local variable called ‘name’.
Rename both to clarify the code and to fix a warning with -Wshadow.

Signed-off-by: Leonardo Brás <leobras.c@gmail.com>
Acked-by: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: David.Laight@aculab.com
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Michal Marek <michal.lkml@markovi.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: helen@koikeco.de
Cc: linux-kbuild@vger.kernel.org
Cc: lkcamp@lists.libreplanetbr.org
Link: http://lkml.kernel.org/r/20181023011022.GA6574@WindFlash
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Leonardo Brás
2018-10-22 22:10:22 -03:00
committed by Ingo Molnar
parent 26b31f46f0
commit b97369f07e
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/x86/entry/vdso/vdso2c.h
View File

@@ -7,7 +7,7 @@
static void BITSFUNC(go)(void *raw_addr, size_t raw_len, static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
void *stripped_addr, size_t stripped_len, void *stripped_addr, size_t stripped_len,
FILE *outfile, const char *name) FILE *outfile, const char *image_name)
{ {
int found_load = 0; int found_load = 0;
unsigned long load_size = -1; /* Work around bogus warning */ unsigned long load_size = -1; /* Work around bogus warning */
@@ -93,11 +93,12 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
int k; int k;
ELF(Sym) *sym = raw_addr + GET_LE(&symtab_hdr->sh_offset) + ELF(Sym) *sym = raw_addr + GET_LE(&symtab_hdr->sh_offset) +
GET_LE(&symtab_hdr->sh_entsize) * i; GET_LE(&symtab_hdr->sh_entsize) * i;
const char *name = raw_addr + GET_LE(&strtab_hdr->sh_offset) + const char *sym_name = raw_addr +
GET_LE(&strtab_hdr->sh_offset) +
GET_LE(&sym->st_name); GET_LE(&sym->st_name);
for (k = 0; k < NSYMS; k++) { for (k = 0; k < NSYMS; k++) {
if (!strcmp(name, required_syms[k].name)) { if (!strcmp(sym_name, required_syms[k].name)) {
if (syms[k]) { if (syms[k]) {
fail("duplicate symbol %s\n", fail("duplicate symbol %s\n",
required_syms[k].name); required_syms[k].name);
@@ -134,7 +135,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
if (syms[sym_vvar_start] % 4096) if (syms[sym_vvar_start] % 4096)
fail("vvar_begin must be a multiple of 4096\n"); fail("vvar_begin must be a multiple of 4096\n");
if (!name) { if (!image_name) {
fwrite(stripped_addr, stripped_len, 1, outfile); fwrite(stripped_addr, stripped_len, 1, outfile);
return; return;
} }
@@ -157,7 +158,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
} }
fprintf(outfile, "\n};\n\n"); fprintf(outfile, "\n};\n\n");
fprintf(outfile, "const struct vdso_image %s = {\n", name); fprintf(outfile, "const struct vdso_image %s = {\n", image_name);
fprintf(outfile, "\t.data = raw_data,\n"); fprintf(outfile, "\t.data = raw_data,\n");
fprintf(outfile, "\t.size = %lu,\n", mapping_size); fprintf(outfile, "\t.size = %lu,\n", mapping_size);
if (alt_sec) { if (alt_sec) {