diff --git a/arch/i386/bits/user.h b/arch/i386/bits/user.h
index 0e343930..33fea986 100644
--- a/arch/i386/bits/user.h
+++ b/arch/i386/bits/user.h
@@ -37,8 +37,8 @@ struct user {
 	int				u_debugreg[8];
 };
 
-#define PAGE_MASK		(~(PAGE_SIZE-1))
-#define NBPG			PAGE_SIZE
+#define PAGE_MASK		(~(PAGESIZE-1))
+#define NBPG			PAGESIZE
 #define UPAGES			1
 #define HOST_TEXT_START_ADDR	(u.start_code)
 #define HOST_STACK_END_ADDR	(u.start_stack + u.u_ssize * NBPG)
diff --git a/arch/s390x/bits/user.h b/arch/s390x/bits/user.h
index 17bce16f..ff3f0483 100644
--- a/arch/s390x/bits/user.h
+++ b/arch/s390x/bits/user.h
@@ -54,8 +54,8 @@ struct user {
 	char u_comm[32];
 };
 
-#define PAGE_MASK            (~(PAGE_SIZE-1))
-#define NBPG                 PAGE_SIZE
+#define PAGE_MASK            (~(PAGESIZE-1))
+#define NBPG                 PAGESIZE
 #define UPAGES               1
 #define HOST_TEXT_START_ADDR (u.start_code)
 #define HOST_STACK_END_ADDR  (u.start_stack + u.u_ssize * NBPG)
diff --git a/arch/x32/bits/user.h b/arch/x32/bits/user.h
index 471bb19d..4073cc06 100644
--- a/arch/x32/bits/user.h
+++ b/arch/x32/bits/user.h
@@ -34,8 +34,8 @@ struct user {
 	unsigned long			u_debugreg[8];
 };
 
-#define PAGE_MASK		(~(PAGE_SIZE-1))
-#define NBPG			PAGE_SIZE
+#define PAGE_MASK		(~(PAGESIZE-1))
+#define NBPG			PAGESIZE
 #define UPAGES			1
 #define HOST_TEXT_START_ADDR	(u.start_code)
 #define HOST_STACK_END_ADDR	(u.start_stack + u.u_ssize * NBPG)
diff --git a/arch/x86_64/bits/user.h b/arch/x86_64/bits/user.h
index 471bb19d..4073cc06 100644
--- a/arch/x86_64/bits/user.h
+++ b/arch/x86_64/bits/user.h
@@ -34,8 +34,8 @@ struct user {
 	unsigned long			u_debugreg[8];
 };
 
-#define PAGE_MASK		(~(PAGE_SIZE-1))
-#define NBPG			PAGE_SIZE
+#define PAGE_MASK		(~(PAGESIZE-1))
+#define NBPG			PAGESIZE
 #define UPAGES			1
 #define HOST_TEXT_START_ADDR	(u.start_code)
 #define HOST_STACK_END_ADDR	(u.start_stack + u.u_ssize * NBPG)