Changeset 965dc18 in mainline for kernel/arch/sparc64/include/mm/mmu.h

Timestamp:

2008-12-05T19:59:03Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

49093a4

Parents:

0258e67

Message:

Merge sparc branch to trunk.

File:

• kernel/arch/sparc64/include/mm/mmu.h (modified) (5 diffs)

kernel/arch/sparc64/include/mm/mmu.h

@@ -36 +36 @@
 #define KERN_sparc64_MMU_H_
 
+#if defined(US)
 /* LSU Control Register ASI. */
 #define ASI_LSU_CONTROL_REG             0x45    /**< Load/Store Unit Control Register. */
+#endif
 
 /* I-MMU ASIs. */
@@ -53 +55 @@
 #define VA_IMMU_TSB_BASE                0x28    /**< IMMU TSB base register. */
 #define VA_IMMU_TAG_ACCESS              0x30    /**< IMMU TLB tag access register. */
+#if defined (US3)
+#define VA_IMMU_PRIMARY_EXTENSION       0x48    /**< IMMU TSB primary extension register */
+#define VA_IMMU_NUCLEUS_EXTENSION       0x58    /**< IMMU TSB nucleus extension register */
+#endif
+
 
 /* D-MMU ASIs. */
@@ -74 +81 @@
 #define VA_DMMU_VA_WATCHPOINT_REG       0x38    /**< DMMU VA data watchpoint register. */
 #define VA_DMMU_PA_WATCHPOINT_REG       0x40    /**< DMMU PA data watchpoint register. */
+#if defined (US3)
+#define VA_DMMU_PRIMARY_EXTENSION       0x48    /**< DMMU TSB primary extension register */
+#define VA_DMMU_SECONDARY_EXTENSION     0x50    /**< DMMU TSB secondary extension register */
+#define VA_DMMU_NUCLEUS_EXTENSION       0x58    /**< DMMU TSB nucleus extension register */
+#endif
 
 #ifndef __ASM__
@@ -81 +93 @@
 #include <arch/types.h>
 
+#if defined(US)
 /** LSU Control Register. */
 typedef union {
@@ -101 +114 @@
         } __attribute__ ((packed));
 } lsu_cr_reg_t;
+#endif /* US */
 
 #endif /* !def __ASM__ */