Changeset 2802767 in mainline

Timestamp:

2006-03-22T22:26:49Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9aa72b4

Parents:

d2ab461

Message:

Small PTE_* macros and SET_PTL0_ADDRESS macro changes.

Files:

• arch/ia64/include/mm/page.h (modified) (1 diff)
• arch/sparc64/include/mm/page.h (modified) (1 diff)
• genarch/include/mm/page_ht.h (modified) (3 diffs)
• genarch/include/mm/page_pt.h (modified) (2 diffs)
• generic/src/mm/as.c (modified) (1 diff)

arch/ia64/include/mm/page.h

@@ -41 +41 @@
 /** Bit width of the TLB-locked portion of kernel address space. */
 #define KERNEL_PAGE_WIDTH       28      /* 256M */
-
-#define SET_PTL0_ADDRESS_ARCH(x)        /**< To be removed as situation permits. */
 
 #define PPN_SHIFT                       12

arch/sparc64/include/mm/page.h

@@ -44 +44 @@
 #define PA2KA(x)        ((__address) (x))
 
-#define SET_PTL0_ADDRESS_ARCH(x)        /**< To be removed as situation permits. */
-
 union page_address {
         __address address;

genarch/include/mm/page_ht.h

@@ -31 +31 @@
  */
 
+#ifdef CONFIG_PAGE_HT
+
 #ifndef __PAGE_HT_H__
 #define __PAGE_HT_H__
@@ -47 +49 @@
 #define PAGE_HT_ENTRIES         (1<<PAGE_HT_ENTRIES_BITS)
 
-#define PTE_VALID_ARCH(pte)             ((pte) != NULL)
-#define PTE_PRESENT_ARCH(pte)           ((pte)->p != 0)
-#define PTE_GET_FRAME_ARCH(pte)         ((pte)->frame)
+#define PTE_VALID(pte)          ((pte) != NULL)
+#define PTE_PRESENT(pte)        ((pte)->p != 0)
+#define PTE_GET_FRAME(pte)      ((pte)->frame)
+
+#define SET_PTL0_ADDRESS(x)
 
 struct pte {
@@ -72 +76 @@
 
 #endif
+
+#endif

genarch/include/mm/page_pt.h

@@ -32 +32 @@
  * are supposed to implement *_ARCH macros.
  */
+
+#ifdef CONFIG_PAGE_PT
 
 #ifndef __PAGE_PT_H__
@@ -103 +105 @@
 
 #endif
+
+#endif

generic/src/mm/as.c

@@ -41 +41 @@
 #include <arch/mm/page.h>
 #include <genarch/mm/page_pt.h>
+#include <genarch/mm/page_ht.h>
 #include <mm/asid.h>
 #include <arch/mm/asid.h>