Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

torvalds · torvalds · commit 57aebd7739c8 · 2010-09-23T08:06:55.000-07:00
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  percpu: fix pcpu_last_unit_cpu
diff --git a/mm/percpu.c b/mm/percpu.c
@@ -1401,9 +1401,9 @@ int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai,
 
 			if (pcpu_first_unit_cpu == NR_CPUS)
 				pcpu_first_unit_cpu = cpu;
+			pcpu_last_unit_cpu = cpu;
 		}
 	}
-	pcpu_last_unit_cpu = cpu;
 	pcpu_nr_units = unit;
 
 	for_each_possible_cpu(cpu)

Original file line number	Diff line number	Diff line change
`@@ -1401,9 +1401,9 @@ int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai,`
`1401`	`1401`
`1402`	`1402`	`if (pcpu_first_unit_cpu == NR_CPUS)`
`1403`	`1403`	`pcpu_first_unit_cpu = cpu;`
	`1404`	`+ pcpu_last_unit_cpu = cpu;`
`1404`	`1405`	`}`
`1405`	`1406`	`}`
`1406`		`- pcpu_last_unit_cpu = cpu;`
`1407`	`1407`	`pcpu_nr_units = unit;`
`1408`	`1408`
`1409`	`1409`	`for_each_possible_cpu(cpu)`