Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

elf: fix shadowed variables in fs/binfmt_elf.c

Browse source 
Fix these sparse warings:
fs/binfmt_elf.c:1749:29: warning: symbol 'tmp' shadows an earlier one
fs/binfmt_elf.c:1734:28: originally declared here
fs/binfmt_elf.c:2009:26: warning: symbol 'vma' shadows an earlier one
fs/binfmt_elf.c:1892:24: originally declared here

[akpm@linux-foundation.org: chose better variable name]
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
WANG Cong 2008-04-29 01:01:18 -07:00 committed by Linus Torvalds
parent 6970c8eff8
commit 4220b7fe89
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
fs/binfmt_elf.c
View file

@ -1722,26 +1722,25 @@ static int fill_note_info(struct elfhdr *elf, int phdrs,
info->thread_status_size = 0; info->thread_status_size = 0;
if (signr) { if (signr) {
struct elf_thread_status *tmp; struct elf_thread_status *ets;
rcu_read_lock(); rcu_read_lock();
do_each_thread(g, p) do_each_thread(g, p)
if (current->mm == p->mm && current != p) { if (current->mm == p->mm && current != p) {
tmp = kzalloc(sizeof(*tmp), GFP_ATOMIC); ets = kzalloc(sizeof(*ets), GFP_ATOMIC);
if (!tmp) { if (!ets) {
rcu_read_unlock(); rcu_read_unlock();
return 0; return 0;
} }
tmp->thread = p; ets->thread = p;
list_add(&tmp->list, &info->thread_list); list_add(&ets->list, &info->thread_list);
} }
while_each_thread(g, p); while_each_thread(g, p);
rcu_read_unlock(); rcu_read_unlock();
list_for_each(t, &info->thread_list) { list_for_each(t, &info->thread_list) {
struct elf_thread_status *tmp;
int sz; int sz;
tmp = list_entry(t, struct elf_thread_status, list); ets = list_entry(t, struct elf_thread_status, list);
sz = elf_dump_thread_status(signr, tmp); sz = elf_dump_thread_status(signr, ets);
info->thread_status_size += sz; info->thread_status_size += sz;
} }
} }
@ -1997,10 +1996,10 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file, un
for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) { for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
struct page *page; struct page *page;
struct vm_area_struct *vma; struct vm_area_struct *tmp_vma;
if (get_user_pages(current, current->mm, addr, 1, 0, 1, if (get_user_pages(current, current->mm, addr, 1, 0, 1,
&page, &vma) <= 0) { &page, &tmp_vma) <= 0) {
DUMP_SEEK(PAGE_SIZE); DUMP_SEEK(PAGE_SIZE);
} else { } else {
if (page == ZERO_PAGE(0)) { if (page == ZERO_PAGE(0)) {
@ -2010,7 +2009,7 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file, un
} }
} else { } else {
void *kaddr; void *kaddr;
flush_cache_page(vma, addr, flush_cache_page(tmp_vma, addr,
page_to_pfn(page)); page_to_pfn(page));
kaddr = kmap(page); kaddr = kmap(page);
if ((size += PAGE_SIZE) > limit || if ((size += PAGE_SIZE) > limit ||