Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[pandora-kernel.git] / arch / mips / mm / tlbex.c

diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 4ec0964..9cb3964 100644 (file)
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -78,7 +78,7 @@ enum fields
        SET = 0x200
 };
 
-#define OP_MASK                0x2f
+#define OP_MASK                0x3f
 #define OP_SH          26
 #define RS_MASK                0x1f
 #define RS_SH          21
@@ -92,7 +92,7 @@ enum fields
 #define IMM_SH         0
 #define JIMM_MASK      0x3ffffff
 #define JIMM_SH                0
-#define FUNC_MASK      0x2f
+#define FUNC_MASK      0x3f
 #define FUNC_SH                0
 #define SET_MASK       0x7
 #define SET_SH         0