Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd105df4 authored by Tobias Klauser's avatar Tobias Klauser Committed by Linus Torvalds
Browse files

[PATCH] mm: clean up local variables 

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: default avatarTobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 152194aa

mm/slab.c

+2 −1
Original line number Diff line number Diff line
@@ -854,7 +854,6 @@ static int __devinit cpuup_callback(struct notifier_block *nfb, 
	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:
@@ -891,6 +890,8 @@ static int __devinit cpuup_callback(struct notifier_block *nfb, 
		/* 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)

mm/swapfile.c

+6 −6
Original line number Diff line number Diff line
@@ -1503,11 +1503,11 @@ asmlinkage long sys_swapon(const char __user * specialfile, int swap_flags) 
		error = 0;

		memset(p->swap_map, 0, maxpages * sizeof(short));

		for (i = 0; i < swap_header->info.nr_badpages; i++) {

			int page = swap_header->info.badpages[i];

			if (page <= 0 || page >= swap_header->info.last_page)

			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 -