diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-04 03:18:08 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-04 03:18:08 +0200 |
commit | 96d4e231d25e3d7d8b7a2a9267043eac5d4560a8 (patch) | |
tree | cdae128f0b4af234a698c9055108cad32f7f628a /kernel/workqueue.c | |
parent | Merge tag 'pci-v3.12-changes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
parent | percpu: Make __verify_pcu_ptr handle per cpu pointers to arrays (diff) | |
download | linux-96d4e231d25e3d7d8b7a2a9267043eac5d4560a8.tar.xz linux-96d4e231d25e3d7d8b7a2a9267043eac5d4560a8.zip |
Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
Pull single percpu update from Tejun Heo:
"Just a single patch to update type verification macro for percpu
accessors.
Christoph is trying to replace __get_cpu_var() with this_cpu accessors
which needs this update. There are still some issues to be resolved
but eventually the conversion patches are likely to be routed through
different trees, so I think it'd be convenient to merge this commit
early"
* 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
percpu: Make __verify_pcu_ptr handle per cpu pointers to arrays
Diffstat (limited to 'kernel/workqueue.c')
0 files changed, 0 insertions, 0 deletions