diff --git a/[refs] b/[refs]
index 609f50ca3262..7bf6d355d1c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8767ba2796a1c894e6d9524584a26a8224f0543d
+refs/heads/master: 129182e5626972ac0df85d43a36dd46ad61c64e1
diff --git a/trunk/mm/percpu.c b/trunk/mm/percpu.c
index 442010cc91c6..083e7c91e5f6 100644
--- a/trunk/mm/percpu.c
+++ b/trunk/mm/percpu.c
@@ -1271,7 +1271,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;
@@ -1279,6 +1279,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);