diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-23 11:06:55 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-23 11:06:55 -0400 |
commit | 57aebd7739c8dbbf403876ee1e9673fafc83d856 (patch) | |
tree | 3ed14ec9da036a05488fd4c08cc1cd5ca414b6e0 | |
parent | 561f8182dbf24b1be9207038aa5f82e34be4bad1 (diff) | |
parent | 46b30ea9bc3698bc1d1e6fd726c9601d46fa0a91 (diff) |
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
-rw-r--r-- | mm/percpu.c | 2 |
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, | |||
1401 | 1401 | ||
1402 | if (pcpu_first_unit_cpu == NR_CPUS) | 1402 | if (pcpu_first_unit_cpu == NR_CPUS) |
1403 | pcpu_first_unit_cpu = cpu; | 1403 | pcpu_first_unit_cpu = cpu; |
1404 | pcpu_last_unit_cpu = cpu; | ||
1404 | } | 1405 | } |
1405 | } | 1406 | } |
1406 | pcpu_last_unit_cpu = cpu; | ||
1407 | pcpu_nr_units = unit; | 1407 | pcpu_nr_units = unit; |
1408 | 1408 | ||
1409 | for_each_possible_cpu(cpu) | 1409 | for_each_possible_cpu(cpu) |