Changeset 43d6401 in mainline for kernel/arch/ppc32/include/mm/page.h

Timestamp:

2009-01-29T18:24:40Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

917c427

Parents:

f817d3a

Message:

ppc32: add support for cache disable page access control

File:

• kernel/arch/ppc32/include/mm/page.h (modified) (3 diffs)

kernel/arch/ppc32/include/mm/page.h

@@ -121 +121 @@
 /* Macros for querying the last-level PTEs. */
 #define PTE_VALID_ARCH(pte)                     (*((uint32_t *) (pte)) != 0)
-#define PTE_PRESENT_ARCH(pte)                   ((pte)->p != 0)
+#define PTE_PRESENT_ARCH(pte)                   ((pte)->present != 0)
 #define PTE_GET_FRAME_ARCH(pte)                 ((pte)->pfn << 12)
 #define PTE_WRITABLE_ARCH(pte)                  1
@@ -135 +135 @@
         pte_t *p = &pt[i];
         
-        return ((1 << PAGE_CACHEABLE_SHIFT) |
-            ((!p->p) << PAGE_PRESENT_SHIFT) |
+        return (((!p->page_cache_disable) << PAGE_CACHEABLE_SHIFT) |
+            ((!p->present) << PAGE_PRESENT_SHIFT) |
             (1 << PAGE_USER_SHIFT) |
             (1 << PAGE_READ_SHIFT) |
             (1 << PAGE_WRITE_SHIFT) |
             (1 << PAGE_EXEC_SHIFT) |
-            (p->g << PAGE_GLOBAL_SHIFT));
+            (p->global << PAGE_GLOBAL_SHIFT));
 }
 
@@ -148 +148 @@
         pte_t *p = &pt[i];
         
-        p->p = !(flags & PAGE_NOT_PRESENT);
-        p->g = (flags & PAGE_GLOBAL) != 0;
+        p->page_cache_disable = !(flags & PAGE_CACHEABLE);
+        p->present = !(flags & PAGE_NOT_PRESENT);
+        p->global = (flags & PAGE_GLOBAL) != 0;
         p->valid = 1;
 }