Changes in kernel/arch/amd64/include/arch/mm/page.h [dc05a9a:4bf0926e] in mainline

File:

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

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

@@ -42 +42 @@
 #define PAGE_SIZE   FRAME_SIZE
 
+#ifdef MEMORY_MODEL_kernel
+
 #ifndef __ASM__
 
@@ -53 +55 @@
 
 #endif /* __ASM__ */
+
+#endif /* MEMORY_MODEL_kernel */
+
+#ifdef MEMORY_MODEL_large
+
+#ifndef __ASM__
+
+#define KA2PA(x)  (((uintptr_t) (x)) - UINT64_C(0xffff800000000000))
+#define PA2KA(x)  (((uintptr_t) (x)) + UINT64_C(0xffff800000000000))
+
+#else /* __ASM__ */
+
+#define KA2PA(x)  ((x) - 0xffff800000000000)
+#define PA2KA(x)  ((x) + 0xffff800000000000)
+
+#endif /* __ASM__ */
+
+#endif /* MEMORY_MODEL_large */
 
 /* Number of entries in each level. */
@@ -131 +151 @@
 /* Macros for querying the last-level PTE entries. */
 #define PTE_VALID_ARCH(p) \
-        ((p)->soft_valid != 0)
+        (*((uint64_t *) (p)) != 0)
 #define PTE_PRESENT_ARCH(p) \
         ((p)->present != 0)