Changeset f6b5593 in mainline for kernel/arch/ia64/include/mm/tlb.h

Timestamp:

2009-09-21T11:53:03Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4098e38

Parents:

2f636b6 (diff), c1618ed (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/ia64/include/mm/tlb.h (modified) (2 diffs)

kernel/arch/ia64/include/mm/tlb.h

@@ -27 +27 @@
  */
 
-/** @addtogroup ia64mm  
+/** @addtogroup ia64mm
  * @{
  */
@@ -42 +42 @@
 
 /** Data and instruction Translation Register indices. */
-#define DTR_KERNEL      0
-#define ITR_KERNEL      0
-#define DTR_KSTACK1     4
-#define DTR_KSTACK2     5
+#define DTR_KERNEL   0
+#define ITR_KERNEL   0
+#define DTR_KSTACK1  4
+#define DTR_KSTACK2  5
 
 /** Portion of TLB insertion format data structure. */
-union tlb_entry {
+typedef union {
         uint64_t word[2];
         struct {
                 /* Word 0 */
-                unsigned p : 1;                 /**< Present. */
-                unsigned : 1;
-                unsigned ma : 3;                /**< Memory attribute. */
-                unsigned a : 1;                 /**< Accessed. */
-                unsigned d : 1;                 /**< Dirty. */
-                unsigned pl : 2;                /**< Privilege level. */
-                unsigned ar : 3;                /**< Access rights. */
-                unsigned long long ppn : 38;    /**< Physical Page Number, a.k.a. PFN. */
-                unsigned : 2;
-                unsigned ed : 1;
-                unsigned ig1 : 11;
-
+                unsigned int p : 1;           /**< Present. */
+                unsigned int : 1;
+                unsigned int ma : 3;          /**< Memory attribute. */
+                unsigned int a : 1;           /**< Accessed. */
+                unsigned int d : 1;           /**< Dirty. */
+                unsigned int pl : 2;          /**< Privilege level. */
+                unsigned int ar : 3;          /**< Access rights. */
+                unsigned long long ppn : 38;  /**< Physical Page Number, a.k.a. PFN. */
+                unsigned int : 2;
+                unsigned int ed : 1;
+                unsigned int ig1 : 11;
+                
                 /* Word 1 */
-                unsigned : 2;
-                unsigned ps : 6;                /**< Page size will be 2^ps. */
-                unsigned key : 24;              /**< Protection key, unused. */
-                unsigned : 32;
+                unsigned int : 2;
+                unsigned int ps : 6;    /**< Page size will be 2^ps. */
+                unsigned int key : 24;  /**< Protection key, unused. */
+                unsigned int : 32;
         } __attribute__ ((packed));
-} __attribute__ ((packed));
-typedef union tlb_entry tlb_entry_t;
+} __attribute__ ((packed)) tlb_entry_t;
 
 extern void tc_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, bool dtc);