Changeset 5ac2e61 in mainline for arch/ia64/include/mm/page.h

Timestamp:

2006-02-22T23:45:51Z (19 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

ab46edb

Parents:

7d53ef4

Message:

Uaaaaaaa Itanium Paging !!!!!!

File:

• arch/ia64/include/mm/page.h (modified) (5 diffs)

arch/ia64/include/mm/page.h

@@ -31 +31 @@
 #define __ia64_PAGE_H__
 
+#ifndef __ASM__
+
+
 #include <arch/mm/frame.h>
+#include <arch/barrier.h>
 #include <genarch/mm/page_ht.h>
 #include <arch/mm/asid.h>
@@ -38 +42 @@
 #include <debug.h>
 
+#endif
+
 #define PAGE_SIZE       FRAME_SIZE
 #define PAGE_WIDTH      FRAME_WIDTH
-
-#define KA2PA(x)        ((__address) (x))
-#define PA2KA(x)        ((__address) (x))
+#define KERNEL_PAGE_WIDTH       26
+
+
 
 #define SET_PTL0_ADDRESS_ARCH(x)        /**< To be removed as situation permits. */
@@ -50 +56 @@
 #define VRN_SHIFT                       61
 #define VRN_MASK                        (7LL << VRN_SHIFT)
-#define VRN_KERNEL                      0
+
+#ifdef __ASM__
+#define VRN_KERNEL                      7
+#else
+#define VRN_KERNEL                      7LL
+#endif
+
 #define REGION_REGISTERS                8
+
+#define KA2PA(x)        ((__address) (x-(VRN_KERNEL<<VRN_SHIFT)))
+#define PA2KA(x)        ((__address) (x+(VRN_KERNEL<<VRN_SHIFT)))
+
 
 #define VHPT_WIDTH                      20              /* 1M */
@@ -77 +93 @@
 #define VA_REGION(va) (va>>VA_REGION_INDEX)
 
-
+#ifndef __ASM__
 
 struct vhpt_tag_info {
@@ -264 +280 @@
 extern void vhpt_set_record(vhpt_entry_t *v, __address page, asid_t asid, __address frame, int flags);
 
-#endif
+
+static inline void pokus(void)
+{
+        region_register rr;
+        rr.word=rr_read(0);
+        srlz_d();
+        rr_write(0,rr.word);
+        srlz_d();
+
+}
+
+#endif
+
+#endif
+
+