Changes in kernel/arch/ia64/include/mm/asid.h [d99c1d2:df4ed85] in mainline

File:

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

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

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