summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-23 17:06:55 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-23 17:06:55 +0200
commit57aebd7739c8dbbf403876ee1e9673fafc83d856 (patch)
tree3ed14ec9da036a05488fd4c08cc1cd5ca414b6e0 /mm
parentipmi: fix hardcoded ipmi device exit path warning (diff)
parentpercpu: fix pcpu_last_unit_cpu (diff)
downloadlinux-57aebd7739c8dbbf403876ee1e9673fafc83d856.tar.xz
linux-57aebd7739c8dbbf403876ee1e9673fafc83d856.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: percpu: fix pcpu_last_unit_cpu
Diffstat (limited to 'mm')
-rw-r--r--mm/percpu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/percpu.c b/mm/percpu.c
index 58c572b18b07..c76ef3891e0d 100644
--- 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)