Changeset 61c0402 in mainline for kernel/arch/mips32/include/mm/page.h

Timestamp:

2010-01-15T19:36:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

92bee46

Parents:

50f9c3a (diff), 963462af (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/mips32/include/mm/page.h (modified) (1 diff)

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

@@ -141 +141 @@
 #include <arch/exception.h>
 
-static inline int get_pt_flags(pte_t *pt, size_t i)
+/** Page Table Entry. */
+typedef struct {
+        unsigned g : 1;                 /**< Global bit. */
+        unsigned p : 1;                 /**< Present bit. */
+        unsigned d : 1;                 /**< Dirty bit. */
+        unsigned cacheable : 1;         /**< Cacheable bit. */
+        unsigned : 1;                   /**< Unused. */
+        unsigned soft_valid : 1;        /**< Valid content even if not present. */
+        unsigned pfn : 24;              /**< Physical frame number. */
+        unsigned w : 1;                 /**< Page writable bit. */
+        unsigned a : 1;                 /**< Accessed bit. */
+} pte_t;
+
+
+static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
 {
         pte_t *p = &pt[i];