diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-11 18:36:26 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-11 18:36:26 -0800 |
commit | eedb3d3304b59c64c811522f4ebaaf83124deeac (patch) | |
tree | 00ede75849525bdc788fc106a1951616bc43c9e0 /kernel/res_counter.c | |
parent | 9d050966e2eb37a643ac15904b6a8fda7fcfabe9 (diff) | |
parent | eadac03e898617521f327faf265932b73ecc3e0f (diff) | |
download | linux-eedb3d3304b59c64c811522f4ebaaf83124deeac.tar.gz linux-eedb3d3304b59c64c811522f4ebaaf83124deeac.tar.bz2 linux-eedb3d3304b59c64c811522f4ebaaf83124deeac.zip |
Merge branch 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
Pull percpu updates from Tejun Heo:
"Nothing interesting. A patch to convert the remaining __get_cpu_var()
users, another to fix non-critical off-by-one in an assertion and a
cosmetic conversion to lockless_dereference() in percpu-ref.
The back-merge from mainline is to receive lockless_dereference()"
* 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
percpu: Replace smp_read_barrier_depends() with lockless_dereference()
percpu: Convert remaining __get_cpu_var uses in 3.18-rcX
percpu: off by one in BUG_ON()
Diffstat (limited to 'kernel/res_counter.c')
0 files changed, 0 insertions, 0 deletions