Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[deliverable/linux.git] / mm / internal.h

diff --git a/mm/internal.h b/mm/internal.h
index 7f22a11fcc66e3e6e0b5a16319f7f4dc232e0ffb..a1b651b11c5fcba7a0322bc19c93286896d08cbf 100644 (file)
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -247,7 +247,7 @@ static inline void mlock_migrate_page(struct page *new, struct page *old) { }
 static inline struct page *mem_map_offset(struct page *base, int offset)
 {
        if (unlikely(offset >= MAX_ORDER_NR_PAGES))
-               return pfn_to_page(page_to_pfn(base) + offset);
+               return nth_page(base, offset);
        return base + offset;
 }