Changeset bd48f4c in mainline for kernel/arch/abs32le/include/mm/page.h

Timestamp:

2010-07-12T10:53:30Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bd11d3e

Parents:

c40e6ef (diff), bee2d4c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/abs32le/include/mm/page.h (modified) (2 diffs)

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

@@ -37 +37 @@
 
 #include <arch/mm/frame.h>
+#include <trace.h>
 
 #define PAGE_WIDTH  FRAME_WIDTH
@@ -139 +140 @@
 } __attribute__((packed)) pte_t;
 
-static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
+NO_TRACE static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
+    REQUIRES_ARRAY_MUTABLE(pt, PTL0_ENTRIES_ARCH)
 {
         pte_t *p = &pt[i];
         
-        return ((!p->page_cache_disable) << PAGE_CACHEABLE_SHIFT |
-            (!p->present) << PAGE_PRESENT_SHIFT |
-            p->uaccessible << PAGE_USER_SHIFT |
-            1 << PAGE_READ_SHIFT |
-            p->writeable << PAGE_WRITE_SHIFT |
-            1 << PAGE_EXEC_SHIFT |
-            p->global << PAGE_GLOBAL_SHIFT);
+        return (
+            ((unsigned int) (!p->page_cache_disable) << PAGE_CACHEABLE_SHIFT) |
+            ((unsigned int) (!p->present) << PAGE_PRESENT_SHIFT) |
+            ((unsigned int) p->uaccessible << PAGE_USER_SHIFT) |
+            (1 << PAGE_READ_SHIFT) |
+            ((unsigned int) p->writeable << PAGE_WRITE_SHIFT) |
+            (1 << PAGE_EXEC_SHIFT) |
+            ((unsigned int) p->global << PAGE_GLOBAL_SHIFT)
+        );
 }
 
-static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
+NO_TRACE static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
+    WRITES(ARRAY_RANGE(pt, PTL0_ENTRIES_ARCH))
+    REQUIRES_ARRAY_MUTABLE(pt, PTL0_ENTRIES_ARCH)
 {
         pte_t *p = &pt[i];