diff options
| author | Tejun Heo <tj@kernel.org> | 2014-05-13 11:27:24 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-05-13 11:27:24 -0400 |
| commit | d39ea871c3c1269e2852ea096fff492ea034df8a (patch) | |
| tree | 762859cc57b776048a968f1ab9ceb06d06d4ffb4 /include/linux/percpu.h | |
| parent | 2b53f41fa8604845f4f7c538723694a453088b15 (diff) | |
| parent | 4fb6e25049cb6fa0accc7f1b7c192b952fad7ac8 (diff) | |
Merge branch 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu into for-3.16
Pull to receive percpu_ref_tryget[_live]() changes. Planned cgroup
changes will make use of them.
Signed-off-by: Tejun Heo <tj@kernel.org>
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 e7a0b95ed527..539b3caa5748 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 |