From: Tobias Klauser Clean up a local variable with the same name as a variable in a larger block. Also move a variable into the block where it's actually used. Spotted by http://linuxicc.sourceforge.net/ Signed-off-by: Tobias Klauser Signed-off-by: Andrew Morton --- mm/slab.c | 3 ++- mm/swapfile.c | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff -puN mm/slab.c~mm-clean-up-local-variables mm/slab.c --- 25/mm/slab.c~mm-clean-up-local-variables Wed Jan 4 15:09:53 2006 +++ 25-akpm/mm/slab.c Wed Jan 4 15:09:53 2006 @@ -857,7 +857,6 @@ static int __devinit cpuup_callback(stru struct kmem_list3 *l3 = NULL; int node = cpu_to_node(cpu); int memsize = sizeof(struct kmem_list3); - struct array_cache *nc = NULL; switch (action) { case CPU_UP_PREPARE: @@ -894,6 +893,8 @@ static int __devinit cpuup_callback(stru /* Now we can go ahead with allocating the shared array's & array cache's */ list_for_each_entry(cachep, &cache_chain, next) { + struct array_cache *nc; + nc = alloc_arraycache(node, cachep->limit, cachep->batchcount); if (!nc) diff -puN mm/swapfile.c~mm-clean-up-local-variables mm/swapfile.c --- 25/mm/swapfile.c~mm-clean-up-local-variables Wed Jan 4 15:09:53 2006 +++ 25-akpm/mm/swapfile.c Wed Jan 4 15:09:53 2006 @@ -1473,7 +1473,7 @@ asmlinkage long sys_swapon(const char __ goto bad_swap; if (swap_header->info.nr_badpages > MAX_SWAP_BADPAGES) goto bad_swap; - + /* OK, set up the swap map and apply the bad block list */ if (!(p->swap_map = vmalloc(maxpages * sizeof(short)))) { error = -ENOMEM; @@ -1482,17 +1482,17 @@ asmlinkage long sys_swapon(const char __ error = 0; memset(p->swap_map, 0, maxpages * sizeof(short)); - for (i=0; iinfo.nr_badpages; i++) { - int page = swap_header->info.badpages[i]; - if (page <= 0 || page >= swap_header->info.last_page) + for (i = 0; i < swap_header->info.nr_badpages; i++) { + int page_nr = swap_header->info.badpages[i]; + if (page_nr <= 0 || page_nr >= swap_header->info.last_page) error = -EINVAL; else - p->swap_map[page] = SWAP_MAP_BAD; + p->swap_map[page_nr] = SWAP_MAP_BAD; } nr_good_pages = swap_header->info.last_page - swap_header->info.nr_badpages - 1 /* header page */; - if (error) + if (error) goto bad_swap; } _