diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-09 14:56:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-09 14:56:07 -0700 |
| commit | 68a29ef2e3f0edd154c3f5093e3c9ec772e4011f (patch) | |
| tree | b2c0594c16acbcb4b1905abac518110be5c4e69b /include/linux/percpu.h | |
| parent | 963649d735c8b6eb0f97e82c54f02426ff3f1f45 (diff) | |
| parent | 315c5554c406fdad404a99dfefc931db0df80692 (diff) | |
Merge branch 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
Pull percpu updates from Tejun Heo:
"Nothing too exciting. percpu_ref is going through some interface
changes and getting new features with more changes in the pipeline but
given its young age and few users, it's very low impact"
* 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
percpu-refcount: implement percpu_ref_tryget()
percpu-refcount: rename percpu_ref_tryget() to percpu_ref_tryget_live()
percpu: Replace __get_cpu_var with this_cpu_ptr
Diffstat (limited to 'include/linux/percpu.h')
| -rw-r--r-- | include/linux/percpu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/percpu.h b/include/linux/percpu.h index 495c6543a8f2..8419053d0f2e 100644 --- a/include/linux/percpu.h +++ b/include/linux/percpu.h @@ -29,7 +29,7 @@ */ #define get_cpu_var(var) (*({ \ preempt_disable(); \ - &__get_cpu_var(var); })) + this_cpu_ptr(&var); })) /* * The weird & is necessary because sparse considers (void)(var) to be |