1 files changed, 14 insertions, 2 deletions

diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index 177d8aaeec42..8c2b50e8abc6 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -1699,9 +1699,21 @@ void __init paging_init(void)
          * functions like clear_dcache_dirty_cpu use the cpu mask
          * in 13-bit signed-immediate instruction fields.
          */
-        BUILD_BUG_ON(FLAGS_RESERVED != 32);
+
+        /*
+         * Page flags must not reach into upper 32 bits that are used
+         * for the cpu number
+         */
+        BUILD_BUG_ON(NR_PAGEFLAGS > 32);
+
+        /*
+         * The bit fields placed in the high range must not reach below
+         * the 32 bit boundary. Otherwise we cannot place the cpu field
+         * at the 32 bit boundary.
+         */
         BUILD_BUG_ON(SECTIONS_WIDTH + NODES_WIDTH + ZONES_WIDTH +
-                     ilog2(roundup_pow_of_two(NR_CPUS)) > FLAGS_RESERVED);
+                ilog2(roundup_pow_of_two(NR_CPUS)) > 32);
+
         BUILD_BUG_ON(NR_CPUS > 4096);
 
         kern_base = (prom_boot_mapping_phys_low >> 22UL) << 22UL;