diff --git a/mm/mremap.c b/mm/mremap.c
index 4caf5f4d0529..1d3870467df6 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -25,6 +25,7 @@
 #include <linux/uaccess.h>
 #include <linux/userfaultfd_k.h>
 #include <linux/mempolicy.h>
+#include <linux/page_size_compat.h>
 
 #include <asm/cacheflush.h>
 #include <asm/tlb.h>
@@ -1063,11 +1064,11 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
 		return ret;
 
 
-	if (offset_in_page(addr))
+	if (__offset_in_page_log(addr))
 		return ret;
 
-	old_len = PAGE_ALIGN(old_len);
-	new_len = PAGE_ALIGN(new_len);
+	old_len = __PAGE_ALIGN(old_len);
+	new_len = __PAGE_ALIGN(new_len);
 
 	/*
 	 * We allow a zero old-len as a special case