2 files changed, 5 insertions, 5 deletions

diff --git a/include/linux/percpu-refcount.h b/include/linux/percpu-refcount.h
index dba35c411e8c..5d8920e23073 100644
--- a/include/linux/percpu-refcount.h
+++ b/include/linux/percpu-refcount.h
@@ -110,7 +110,7 @@ static inline void percpu_ref_get(struct percpu_ref *ref)
         pcpu_count = ACCESS_ONCE(ref->pcpu_count);
 
         if (likely(REF_STATUS(pcpu_count) == PCPU_REF_PTR))
-                __this_cpu_inc(*pcpu_count);
+                this_cpu_inc(*pcpu_count);
         else
                 atomic_inc(&ref->count);
 
@@ -136,7 +136,7 @@ static inline bool percpu_ref_tryget(struct percpu_ref *ref)
         pcpu_count = ACCESS_ONCE(ref->pcpu_count);
 
         if (likely(REF_STATUS(pcpu_count) == PCPU_REF_PTR)) {
-                __this_cpu_inc(*pcpu_count);
+                this_cpu_inc(*pcpu_count);
                 ret = true;
         } else {
                 ret = atomic_inc_not_zero(&ref->count);
@@ -171,7 +171,7 @@ static inline bool percpu_ref_tryget_live(struct percpu_ref *ref)
         pcpu_count = ACCESS_ONCE(ref->pcpu_count);
 
         if (likely(REF_STATUS(pcpu_count) == PCPU_REF_PTR)) {
-                __this_cpu_inc(*pcpu_count);
+                this_cpu_inc(*pcpu_count);
                 ret = true;
         }
 
@@ -196,7 +196,7 @@ static inline void percpu_ref_put(struct percpu_ref *ref)
         pcpu_count = ACCESS_ONCE(ref->pcpu_count);
 
         if (likely(REF_STATUS(pcpu_count) == PCPU_REF_PTR))
-                __this_cpu_dec(*pcpu_count);
+                this_cpu_dec(*pcpu_count);
         else if (unlikely(atomic_dec_and_test(&ref->count)))
                 ref->release(ref);
 
diff --git a/mm/percpu.c b/mm/percpu.c
index 63e24fb4387b..2ddf9a990dbd 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -610,7 +610,7 @@ static struct pcpu_chunk *pcpu_alloc_chunk(void)
         chunk->map = pcpu_mem_zalloc(PCPU_DFL_MAP_ALLOC *
                                                 sizeof(chunk->map[0]));
         if (!chunk->map) {
-                kfree(chunk);
+                pcpu_mem_free(chunk, pcpu_chunk_struct_size);
                 return NULL;
         }