Reinstall your kernel headers.
Signed-off-by: Barret Rhoden <[email protected]>
---
kern/arch/riscv/ros/mmu.h | 5 -----
kern/arch/x86/ros/mmu64.h | 15 +--------------
2 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/kern/arch/riscv/ros/mmu.h b/kern/arch/riscv/ros/mmu.h
index c3ed833db38c..f6e5d9d647fe 100644
--- a/kern/arch/riscv/ros/mmu.h
+++ b/kern/arch/riscv/ros/mmu.h
@@ -74,11 +74,6 @@
// index into L4 PT
#define L4X(la) ((((uintptr_t) (la)) >> L4PGSHIFT) &
(NPTENTRIES-1))
-// construct linear address from indexes and offset
-#define PGADDR(l1, l2, l3, l4, o) ((uintptr_t) ((l1) << L1PGSHIFT | (l2) <<
L2PGSHIFT | (l3) << L3PGSHIFT | (l4) << L4PGSHIFT | (o)))
-#else
-// construct linear address from indexes and offset
-#define PGADDR(l1, l2, o) ((uintptr_t) ((l1) << L1PGSHIFT | (l2) << L2PGSHIFT
| (o)))
#endif
// offset in page
diff --git a/kern/arch/x86/ros/mmu64.h b/kern/arch/x86/ros/mmu64.h
index 7491b6e40aae..637d72c24356 100644
--- a/kern/arch/x86/ros/mmu64.h
+++ b/kern/arch/x86/ros/mmu64.h
@@ -249,27 +249,14 @@ typedef struct x86_pgdir {
#define LA2PPN(la) ((uintptr_t)(la) >> PGSHIFT)
#define PTE2PPN(pte) LA2PPN(pte)
#define PGOFF(la) ((uintptr_t)(la) & (PGSIZE - 1))
+#define NPTENTRIES 512
/* construct PTE from PPN and flags */
#define PTE(ppn, flags) ((ppn) << PGSHIFT | PGOFF(flags))
-/* construct linear address from indexes and offset */
-#define PGADDR(p4, p3, p2, p1, o) ((void*)(((p4) << PML4_SHIFT) |
\
- ((p3) << PML3_SHIFT) |
\
- ((p2) << PML2_SHIFT) |
\
- ((p1) << PML1_SHIFT) |(o)))
-
/* This is used in places (procinfo) meaning "size of smallest jumbo page" */
#define PTSIZE PML2_PTE_REACH
-
-/* TODO: not sure if we'll need these - limited to 64bit code */
-/* this only gives us the L1 PML */
-#define PTX(la) ((((uintptr_t) (la)) >> 12) & 0x1ff)
-#define JPGOFF(la) (((uintptr_t) (la)) & 0x001FFFFF)
-#define NPTENTRIES 512
-#define JPGSIZE PTSIZE
-
/* Page table/directory entry flags. */
/* Some things to be careful of: Global and PAT only apply to the last PTE in
--
2.6.0.rc2.230.g3dd15c0
--
You received this message because you are subscribed to the Google Groups
"Akaros" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
For more options, visit https://groups.google.com/d/optout.
