diff --git a/include/nuttx/page.h b/include/nuttx/page.h
index 05a9980ac0..2971e14fb6 100644
--- a/include/nuttx/page.h
+++ b/include/nuttx/page.h
@@ -48,17 +48,18 @@
  */
 
 #if CONFIG_PAGING_PAGESIZE == 1024
-#  define PAGESIZE                 1024
 #  define PAGESHIFT                10
-#  define PAGEMASK                 0x000003ff
 #elif CONFIG_PAGING_PAGESIZE == 4096
-#  define PAGESIZE                 4096
 #  define PAGESHIFT                12
-#  define PAGEMASK                 0x00000fff
 #else
 #  error "Need extended definitions for CONFIG_PAGING_PAGESIZE"
 #endif
 
+/* Common page macros */
+
+#  define PAGESIZE                 (1 << PAGESHIFT)
+#  define PAGEMASK                 (PAGESIZE - 1)
+
 /* Alignment macros */
 
 #define PG_ALIGNDOWN(addr)         ((addr) & ~PAGEMASK)