diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
index 35b6bd03520f5fa37a20aeeeed604f99e1c9ff6a..625c3f0e741aab7bd75d839cadf7084c303baa61 100644
--- a/arch/x86/include/asm/page.h
+++ b/arch/x86/include/asm/page.h
@@ -49,7 +49,6 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
  * virt_addr_valid(kaddr) returns true.
  */
 #define virt_to_page(kaddr)	pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
-#define virt_to_page_fast(kaddr) pfn_to_page(((unsigned long)(kaddr) - PAGE_OFFSET) >> PAGE_SHIFT)
 #define pfn_to_kaddr(pfn)      __va((pfn) << PAGE_SHIFT)
 extern bool __virt_addr_valid(unsigned long kaddr);
 #define virt_addr_valid(kaddr)	__virt_addr_valid((unsigned long) (kaddr))
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 7bbf4af889082b45be5f8c6d86edd256a0267b8d..9a72cc78e6b817d2b7c24b076eef7bd0061235f2 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -305,11 +305,7 @@ static inline void get_page(struct page *page)
 
 static inline struct page *virt_to_head_page(const void *x)
 {
-#ifdef virt_to_page_fast
-	struct page *page = virt_to_page_fast(x);
-#else
 	struct page *page = virt_to_page(x);
-#endif
 	return compound_head(page);
 }
 
diff --git a/mm/slqb.c b/mm/slqb.c
index 276270a1f037af656c3700bb72b52147534d52b0..6a74579ade709a21210ea47ac89dcdf26d1ca51c 100644
--- a/mm/slqb.c
+++ b/mm/slqb.c
@@ -156,11 +156,7 @@ static inline struct zone *slqb_page_zone(struct slqb_page *page)
 
 static inline int virt_to_nid(const void *addr)
 {
-#ifdef virt_to_page_fast
-	return page_to_nid(virt_to_page_fast(addr));
-#else
 	return page_to_nid(virt_to_page(addr));
-#endif
 }
 
 static inline struct slqb_page *virt_to_head_slqb_page(const void *addr)