Changeset 371bd7d in mainline for kernel/arch/ia64/include/mm

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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.

Location:

kernel/arch/ia64/include/mm

Files:

• asid.h (modified) (2 diffs)
• frame.h (modified) (1 diff)
• page.h (modified) (1 diff)
• tlb.h (modified) (1 diff)

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

@@ -38 +38 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 typedef uint16_t asid_t;
@@ -50 +50 @@
  * but those extra bits are not used by the kernel. 
  */
-#define RIDS_PER_ASID           7
+#define RIDS_PER_ASID           8
 
 #define RID_MAX                 262143          /* 2^18 - 1 */
-#define RID_KERNEL              0
-#define RID_INVALID             1
+#define RID_KERNEL7             7
 
-#define ASID2RID(asid, vrn)     (((asid)>RIDS_PER_ASID)?(((asid)*RIDS_PER_ASID)+(vrn)):(asid))
-#define RID2ASID(rid)           ((rid)/RIDS_PER_ASID)
+#define ASID2RID(asid, vrn) \
+        ((asid) * RIDS_PER_ASID + (vrn))
 
-#define ASID_MAX_ARCH           (RID_MAX/RIDS_PER_ASID)
+#define RID2ASID(rid) \
+        ((rid) / RIDS_PER_ASID)
+
+#define ASID_MAX_ARCH           (RID_MAX / RIDS_PER_ASID)
 
 #endif

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

@@ -42 +42 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 extern uintptr_t last_frame;

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

@@ -108 +108 @@
 #include <arch/barrier.h>
 #include <arch/mm/asid.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <debug.h>
 

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

@@ -39 +39 @@
 #include <arch/mm/asid.h>
 #include <arch/interrupt.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Data and instruction Translation Register indices. */