summaryrefslogtreecommitdiffstats
path: root/net/caif
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-09 13:08:28 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-09 13:08:28 -0800
commit6b3da11b3c36fdafce3a72e0e90d6c4e99e9aad5 (patch)
tree33e64fc453619978c3ecc86c7ec3649db3b4d8dc /net/caif
parentdb0c2bf69aa095d4a6de7b1145f29fe9a7c0f6a3 (diff)
parent933393f58fef9963eac61db8093689544e29a600 (diff)
downloadop-kernel-dev-6b3da11b3c36fdafce3a72e0e90d6c4e99e9aad5.zip
op-kernel-dev-6b3da11b3c36fdafce3a72e0e90d6c4e99e9aad5.tar.gz
Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
* 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: percpu: Remove irqsafe_cpu_xxx variants Fix up conflict in arch/x86/include/asm/percpu.h due to clash with cebef5beed3d ("x86: Fix and improve percpu_cmpxchg{8,16}b_double()") which edited the (now removed) irqsafe_cpu_cmpxchg*_double code.
Diffstat (limited to 'net/caif')
-rw-r--r--net/caif/caif_dev.c4
-rw-r--r--net/caif/cffrml.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c
index b0ce14f..61570ee 100644
--- a/net/caif/caif_dev.c
+++ b/net/caif/caif_dev.c
@@ -76,12 +76,12 @@ static struct caif_device_entry_list *caif_device_list(struct net *net)
static void caifd_put(struct caif_device_entry *e)
{
- irqsafe_cpu_dec(*e->pcpu_refcnt);
+ this_cpu_dec(*e->pcpu_refcnt);
}
static void caifd_hold(struct caif_device_entry *e)
{
- irqsafe_cpu_inc(*e->pcpu_refcnt);
+ this_cpu_inc(*e->pcpu_refcnt);
}
static int caifd_refcnt_read(struct caif_device_entry *e)
diff --git a/net/caif/cffrml.c b/net/caif/cffrml.c
index d3ca87b..0a7df7e 100644
--- a/net/caif/cffrml.c
+++ b/net/caif/cffrml.c
@@ -177,14 +177,14 @@ void cffrml_put(struct cflayer *layr)
{
struct cffrml *this = container_obj(layr);
if (layr != NULL && this->pcpu_refcnt != NULL)
- irqsafe_cpu_dec(*this->pcpu_refcnt);
+ this_cpu_dec(*this->pcpu_refcnt);
}
void cffrml_hold(struct cflayer *layr)
{
struct cffrml *this = container_obj(layr);
if (layr != NULL && this->pcpu_refcnt != NULL)
- irqsafe_cpu_inc(*this->pcpu_refcnt);
+ this_cpu_inc(*this->pcpu_refcnt);
}
int cffrml_refcnt_read(struct cflayer *layr)
OpenPOWER on IntegriCloud