1 files changed, 5 insertions, 6 deletions

diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
index 087f1a04f9bc..94e5b624de64 100644
--- a/lib/percpu-refcount.c
+++ b/lib/percpu-refcount.c
@@ -33,7 +33,7 @@
 
 static unsigned __percpu *pcpu_count_ptr(struct percpu_ref *ref)
 {
-        return (unsigned __percpu *)((unsigned long)ref->pcpu_count & ~PCPU_REF_DEAD);
+        return (unsigned __percpu *)(ref->pcpu_count_ptr & ~PCPU_REF_DEAD);
 }
 
 /**
@@ -51,8 +51,8 @@ int percpu_ref_init(struct percpu_ref *ref, percpu_ref_func_t *release)
 {
         atomic_set(&ref->count, 1 + PCPU_COUNT_BIAS);
 
-        ref->pcpu_count = alloc_percpu(unsigned);
-        if (!ref->pcpu_count)
+        ref->pcpu_count_ptr = (unsigned long)alloc_percpu(unsigned);
+        if (!ref->pcpu_count_ptr)
                 return -ENOMEM;
 
         ref->release = release;
@@ -153,11 +153,10 @@ static void percpu_ref_kill_rcu(struct rcu_head *rcu)
 void percpu_ref_kill_and_confirm(struct percpu_ref *ref,
                                  percpu_ref_func_t *confirm_kill)
 {
-        WARN_ONCE((unsigned long)ref->pcpu_count & PCPU_REF_DEAD,
+        WARN_ONCE(ref->pcpu_count_ptr & PCPU_REF_DEAD,
                   "percpu_ref_kill() called more than once!\n");
 
-        ref->pcpu_count = (unsigned __percpu *)
-                (((unsigned long) ref->pcpu_count)|PCPU_REF_DEAD);
+        ref->pcpu_count_ptr |= PCPU_REF_DEAD;
         ref->confirm_kill = confirm_kill;
 
         call_rcu_sched(&ref->rcu, percpu_ref_kill_rcu);