Changeset 2a003d5b in mainline for arch

Timestamp:

2006-01-26T14:13:50Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c2b95d3

Parents:

4a2f4bb

Message:

Page hash table modifications.

Location:

arch

Files:

• ia64/include/asm.h (modified) (1 diff)
• ia64/include/mm/page.h (modified) (1 diff)
• ia64/include/register.h (modified) (1 diff)
• ia64/src/mm/page.c (modified) (2 diffs)
• sparc64/include/mm/page.h (modified) (1 diff)

arch/ia64/include/asm.h

@@ -240 +240 @@
 }
 
+/** Disable protection key checking. */
+static inline void pk_disable(void)
+{
+        __asm__ volatile ("rsm %0\n" : : "i" (PSR_PK_MASK));
+}
+
 extern void cpu_halt(void);
 extern void cpu_sleep(void);

arch/ia64/include/mm/page.h

@@ -43 +43 @@
 
 /** Implementation of page hash table interface. */
+#define HT_ENTRIES_ARCH                 0
 #define HT_HASH_ARCH(page, asid)        0
 #define HT_COMPARE_ARCH(page, asid, t)  0
 #define HT_SLOT_EMPTY_ARCH(t)           1
+#define HT_INVALIDATE_SLOT_ARCH(t)
 #define HT_GET_NEXT_ARCH(t)             0
 #define HT_SET_NEXT_ARCH(t, s)

arch/ia64/include/register.h

@@ -35 +35 @@
 
 #define CR_IVR_MASK     0xf
+#define PSR_IC_MASK     0x2000
 #define PSR_I_MASK      0x4000
-#define PSR_IC_MASK     0x2000
+#define PSR_PK_MASK     0x8000
 
 /** Application registers. */

arch/ia64/src/mm/page.c

@@ -34 +34 @@
 #include <config.h>
 #include <panic.h>
+#include <arch/asm.h>
 
 __u64 thash(__u64 va);
@@ -141 +142 @@
 {
         page_operations = &page_ht_operations;
+        pk_disable();
         set_VHPT_environment();
 }

arch/sparc64/include/mm/page.h

@@ -43 +43 @@
 
 /** Implementation of page hash table interface. */
+#define HT_ENTRIES_ARCH                 0
 #define HT_HASH_ARCH(page, asid)        0
 #define HT_COMPARE_ARCH(page, asid, t)  0
 #define HT_SLOT_EMPTY_ARCH(t)           1
+#define HT_INVALIDATE_SLOT_ARCH(t)
 #define HT_GET_NEXT_ARCH(t)             0
 #define HT_SET_NEXT_ARCH(t, s)