Merge tag 'kmemleak' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux

[~andy/linux] / mm / percpu.c

diff --git a/mm/percpu.c b/mm/percpu.c
index 86c5bdbdc3705291f3b7f2470d10e1e3d1391124..f47af9123af78e84d37c473a11daf72093c1ce50 100644 (file)
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -1029,9 +1029,11 @@ phys_addr_t per_cpu_ptr_to_phys(void *addr)
                if (!is_vmalloc_addr(addr))
                        return __pa(addr);
                else
-                       return page_to_phys(vmalloc_to_page(addr));
+                       return page_to_phys(vmalloc_to_page(addr)) +
+                              offset_in_page(addr);
        } else
-               return page_to_phys(pcpu_addr_to_page(addr));
+               return page_to_phys(pcpu_addr_to_page(addr)) +
+                      offset_in_page(addr);
 }
 
 /**