Merge branch 'master' into percpu

[mv-sheeva.git] / mm / percpu.c

diff --git a/mm/percpu.c b/mm/percpu.c
index 626e43c99498d878281c20211b56afd361e93af2..b336638d20e7f1c68ce263dbb267fbd28185a191 100644 (file)
--- 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);