Changes in kernel/genarch/src/mm/page_pt.c [caed0279:a2789d2] in mainline

File:

• kernel/genarch/src/mm/page_pt.c (modified) (4 diffs)

kernel/genarch/src/mm/page_pt.c

@@ -48 +48 @@
 #include <align.h>
 #include <macros.h>
-#include <bitops.h>
 
 static void pt_mapping_insert(as_t *, uintptr_t, uintptr_t, unsigned int);
@@ -293 +292 @@
 }
 
-/** Return the size of the region mapped by a single PTL0 entry.
- *
- * @return Size of the region mapped by a single PTL0 entry.
- */
-static uintptr_t ptl0_step_get(void)
-{
-        size_t va_bits;
-
-        va_bits = fnzb(PTL0_ENTRIES) + fnzb(PTL1_ENTRIES) + fnzb(PTL2_ENTRIES) +
-            fnzb(PTL3_ENTRIES) + PAGE_WIDTH;
-
-        return 1UL << (va_bits - fnzb(PTL0_ENTRIES));
-}
-
 /** Make the mappings in the given range global accross all address spaces.
  *
@@ -324 +309 @@
 {
         uintptr_t ptl0 = PA2KA((uintptr_t) AS_KERNEL->genarch.page_table);
-        uintptr_t ptl0_step = ptl0_step_get();
+        uintptr_t ptl0step = (((uintptr_t) -1) / PTL0_ENTRIES) + 1;
         size_t order;
         uintptr_t addr;
@@ -336 +321 @@
 #endif
 
+        ASSERT(ispwr2(ptl0step));
         ASSERT(size > 0);
 
-        for (addr = ALIGN_DOWN(base, ptl0_step); addr - 1 < base + size - 1;
-            addr += ptl0_step) {
+        for (addr = ALIGN_DOWN(base, ptl0step); addr - 1 < base + size - 1;
+            addr += ptl0step) {
                 uintptr_t l1;