summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-09-02 18:03:25 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-02 18:03:25 +0300
commit76ec51ef5edfe540bbc3c61b860f88deb8e6a37b (patch)
tree1d3c74529172c6ad37048407b4a0c513f59bc3e6 /mm
parent7d3e2eb1786fafa186eb8bc276edef75ba69e023 (diff)
parent292c24a073ee34c629966eec8b48d54b0a206667 (diff)
downloadlinux-76ec51ef5edfe540bbc3c61b860f88deb8e6a37b.tar.xz
Merge branch 'for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
Pull percpu updates from Tejun Heo: "Minor cleanups" * 'for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: percpu: clean up of schunk->map[] assignment in pcpu_setup_first_chunk percpu: update incorrect comment for this_cpu_*() operations
Diffstat (limited to 'mm')
-rw-r--r--mm/percpu.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/mm/percpu.c b/mm/percpu.c
index 2dd74487a0af..a63b4d82a141 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -1668,9 +1668,8 @@ int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai,
schunk->map[1] = ai->static_size;
schunk->map_used = 1;
if (schunk->free_size)
- schunk->map[++schunk->map_used] = 1 | (ai->static_size + schunk->free_size);
- else
- schunk->map[1] |= 1;
+ schunk->map[++schunk->map_used] = ai->static_size + schunk->free_size;
+ schunk->map[schunk->map_used] |= 1;
/* init dynamic chunk if necessary */
if (dyn_size) {