diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-02 14:29:45 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-02 14:29:45 +1000 |
| commit | 53a775d104e2c7c50e2d322c5778f3b495ae4355 (patch) | |
| tree | dd2265f3c3082539d9d724f642c1ae9e3f3e7f1e | |
| parent | 2ebbbc0464f8be40c8fd4bf9ec98cc892ade2ae1 (diff) | |
| parent | 292c24a073ee34c629966eec8b48d54b0a206667 (diff) | |
Merge remote-tracking branch 'percpu/for-next'
| -rw-r--r-- | include/linux/percpu-defs.h | 6 | ||||
| -rw-r--r-- | mm/percpu.c | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/include/linux/percpu-defs.h b/include/linux/percpu-defs.h index 57f3a1c550dc..8f16299ca068 100644 --- a/include/linux/percpu-defs.h +++ b/include/linux/percpu-defs.h @@ -488,10 +488,8 @@ do { \ #define __this_cpu_dec_return(pcp) __this_cpu_add_return(pcp, -1) /* - * Operations with implied preemption protection. These operations can be - * used without worrying about preemption. Note that interrupts may still - * occur while an operation is in progress and if the interrupt modifies - * the variable too then RMW actions may not be reliable. + * Operations with implied preemption/interrupt protection. These + * operations can be used without worrying about preemption or interrupt. */ #define this_cpu_read(pcp) __pcpu_size_call_return(this_cpu_read_, pcp) #define this_cpu_write(pcp, val) __pcpu_size_call(this_cpu_write_, pcp, val) 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) { |