Changeset 61c0402 in mainline for kernel/arch/amd64/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/amd64/include/mm/page.h (modified) (1 diff)

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

@@ -177 +177 @@
 #define PFERR_CODE_ID           (1 << 4)
 
-static inline int get_pt_flags(pte_t *pt, size_t i)
+/** Page Table Entry. */
+typedef struct {
+        unsigned present : 1;
+        unsigned writeable : 1;
+        unsigned uaccessible : 1;
+        unsigned page_write_through : 1;
+        unsigned page_cache_disable : 1;
+        unsigned accessed : 1;
+        unsigned dirty : 1;
+        unsigned unused: 1;
+        unsigned global : 1;
+        unsigned soft_valid : 1;                /**< Valid content even if present bit is cleared. */
+        unsigned avl : 2;
+        unsigned addr_12_31 : 30;
+        unsigned addr_32_51 : 21;
+        unsigned no_execute : 1;
+} __attribute__ ((packed)) pte_t;
+
+static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
 {
         pte_t *p = &pt[i];