diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2015-09-02 08:03:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2015-09-02 08:03:25 -0700 |
| commit | 76ec51ef5edfe540bbc3c61b860f88deb8e6a37b (patch) | |
| tree | 1d3c74529172c6ad37048407b4a0c513f59bc3e6 /include | |
| parent | Merge branch 'for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq (diff) | |
| parent | percpu: clean up of schunk->map[] assignment in pcpu_setup_first_chunk (diff) | |
| download | linux-76ec51ef5edfe540bbc3c61b860f88deb8e6a37b.tar.gz linux-76ec51ef5edfe540bbc3c61b860f88deb8e6a37b.tar.bz2 linux-76ec51ef5edfe540bbc3c61b860f88deb8e6a37b.zip | |
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 'include')
| -rw-r--r-- | include/linux/percpu-defs.h | 6 |
1 files changed, 2 insertions, 4 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) |