Changeset b3f8fb7 in mainline for kernel/arch/amd64/include/mm/page.h

Timestamp:

2007-01-28T13:25:49Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

8e8c1a5

Parents:

1ba41c5

Message:

huge type system cleanup
remove cyclical type dependencies across multiple header files
many minor coding style fixes

File:

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

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

@@ -58 +58 @@
 
 #ifndef __ASM__
-#  include <mm/page.h>
-#  include <arch/types.h>
-#endif
+#       include <mm/mm.h>
+#       include <arch/types.h>
+#       include <arch/interrupt.h>
 
-#ifndef __ASM__
 static inline uintptr_t ka2pa(uintptr_t x)
 {
@@ -70 +69 @@
                 return x - 0xffff800000000000;
 }
-# define KA2PA(x)      ka2pa((uintptr_t)x)
-# define PA2KA_CODE(x)      (((uintptr_t) (x)) + 0xffffffff80000000)
-# define PA2KA(x)      (((uintptr_t) (x)) + 0xffff800000000000)
+
+#       define KA2PA(x)      ka2pa((uintptr_t)x)
+#       define PA2KA_CODE(x)      (((uintptr_t) (x)) + 0xffffffff80000000)
+#       define PA2KA(x)      (((uintptr_t) (x)) + 0xffff800000000000)
 #else
-# define KA2PA(x)      ((x) - 0xffffffff80000000)
-# define PA2KA(x)      ((x) + 0xffffffff80000000)
+#       define KA2PA(x)      ((x) - 0xffffffff80000000)
+#       define PA2KA(x)      ((x) + 0xffffffff80000000)
 #endif
 
@@ -134 +134 @@
 #define PFERR_CODE_ID           (1<<4)
 
-/** Page Table Entry. */
-struct page_specifier {
-        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));
-
 static inline int get_pt_flags(pte_t *pt, index_t i)
 {