Merge branch 'master' into percpu

1 files changed, 3 insertions, 1 deletions

diff --git a/mm/percpu.c b/mm/percpu.c
index 626e43c9949..b336638d20e 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -1269,7 +1269,7 @@ static void pcpu_reclaim(struct work_struct *work)
  */
 void free_percpu(void *ptr)
 {
-        void *addr = __pcpu_ptr_to_addr(ptr);
+        void *addr;
         struct pcpu_chunk *chunk;
         unsigned long flags;
         int off;
@@ -1277,6 +1277,8 @@ void free_percpu(void *ptr)
         if (!ptr)
                 return;
 
+        addr = __pcpu_ptr_to_addr(ptr);
+
         spin_lock_irqsave(&pcpu_lock, flags);
 
         chunk = pcpu_chunk_addr_search(addr);