diff options
author | Christoph Lameter <cl@linux.com> | 2011-12-22 12:58:51 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2011-12-22 13:40:20 -0500 |
commit | 933393f58fef9963eac61db8093689544e29a600 (patch) | |
tree | 719f8b231499aa4ea023bc1a06db4582df5f0965 /net/caif/cffrml.c | |
parent | ecefc36b41ac0fe92d76273a23faf27b2da13411 (diff) |
percpu: Remove irqsafe_cpu_xxx variants
We simply say that regular this_cpu use must be safe regardless of
preemption and interrupt state. That has no material change for x86
and s390 implementations of this_cpu operations. However, arches that
do not provide their own implementation for this_cpu operations will
now get code generated that disables interrupts instead of preemption.
-tj: This is part of on-going percpu API cleanup. For detailed
discussion of the subject, please refer to the following thread.
http://thread.gmane.org/gmane.linux.kernel/1222078
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
LKML-Reference: <alpine.DEB.2.00.1112221154380.11787@router.home>
Diffstat (limited to 'net/caif/cffrml.c')
-rw-r--r-- | net/caif/cffrml.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/caif/cffrml.c b/net/caif/cffrml.c index d3ca87bf23b7..0a7df7ef062d 100644 --- a/net/caif/cffrml.c +++ b/net/caif/cffrml.c | |||
@@ -177,14 +177,14 @@ void cffrml_put(struct cflayer *layr) | |||
177 | { | 177 | { |
178 | struct cffrml *this = container_obj(layr); | 178 | struct cffrml *this = container_obj(layr); |
179 | if (layr != NULL && this->pcpu_refcnt != NULL) | 179 | if (layr != NULL && this->pcpu_refcnt != NULL) |
180 | irqsafe_cpu_dec(*this->pcpu_refcnt); | 180 | this_cpu_dec(*this->pcpu_refcnt); |
181 | } | 181 | } |
182 | 182 | ||
183 | void cffrml_hold(struct cflayer *layr) | 183 | void cffrml_hold(struct cflayer *layr) |
184 | { | 184 | { |
185 | struct cffrml *this = container_obj(layr); | 185 | struct cffrml *this = container_obj(layr); |
186 | if (layr != NULL && this->pcpu_refcnt != NULL) | 186 | if (layr != NULL && this->pcpu_refcnt != NULL) |
187 | irqsafe_cpu_inc(*this->pcpu_refcnt); | 187 | this_cpu_inc(*this->pcpu_refcnt); |
188 | } | 188 | } |
189 | 189 | ||
190 | int cffrml_refcnt_read(struct cflayer *layr) | 190 | int cffrml_refcnt_read(struct cflayer *layr) |