diff options
| author | Tejun Heo <tj@kernel.org> | 2014-06-04 12:50:14 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-06-04 12:50:47 -0400 |
| commit | 315c5554c406fdad404a99dfefc931db0df80692 (patch) | |
| tree | 2c186389e11d53f5341e6df98e3ca349b1ea899c /kernel/workqueue.c | |
| parent | 4fb6e25049cb6fa0accc7f1b7c192b952fad7ac8 (diff) | |
| parent | 0c36b390a546055b6815d4b93a2c9fed4d980ffb (diff) | |
Merge branch 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git into for-3.16
Pull percpu/for-3.15-fixes into percpu/for-3.16 to receive
0c36b390a546 ("percpu-refcount: fix usage of this_cpu_ops").
The merge doesn't produce any conflict but the automatic merge is
still incorrect because 4fb6e25049cb ("percpu-refcount: implement
percpu_ref_tryget()") added another use of __this_cpu_inc() which
should also be converted to this_cpu_ince().
This commit pulls in percpu/for-3.15-fixes and converts the newly
added __this_cpu_inc() to this_cpu_inc().
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/workqueue.c')
0 files changed, 0 insertions, 0 deletions