Changeset a33f0a6 in mainline for kernel/arch/ia64/include/register.h

Timestamp:

2011-08-03T17:34:57Z (15 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

1940326

Parents:

52a79081 (diff), 3fab770 (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 from mainline

File:

• kernel/arch/ia64/include/register.h (modified) (1 diff)

kernel/arch/ia64/include/register.h

@@ -60 +60 @@
 #define PSR_CPL_SHIFT         32
 #define PSR_CPL_MASK_SHIFTED  3
+
+#define PSR_RI_SHIFT    41
+#define PSR_RI_LEN      2
 
 #define PFM_MASK  (~0x3fffffffff)