Merge branch 'x86/cleanups' into x86/trampoline

[mv-sheeva.git] / arch / tile / kernel / traps.c

diff --git a/arch/tile/kernel/traps.c b/arch/tile/kernel/traps.c
index 3870abbeeaa240a29f82f793c06a5161f253e232..0f362dc2c57f6f68d5c32e90b65c32f5b28d8f7d 100644 (file)
--- a/arch/tile/kernel/traps.c
+++ b/arch/tile/kernel/traps.c
@@ -128,7 +128,9 @@ static int special_ill(bundle_bits bundle, int *sigp, int *codep)
 #ifdef __tilegx__
        if ((bundle & TILEGX_BUNDLE_MODE_MASK) != 0)
                return 0;
-       if (get_Opcode_X1(bundle) != UNARY_OPCODE_X1)
+       if (get_Opcode_X1(bundle) != RRR_0_OPCODE_X1)
+               return 0;
+       if (get_RRROpcodeExtension_X1(bundle) != UNARY_RRR_0_OPCODE_X1)
                return 0;
        if (get_UnaryOpcodeExtension_X1(bundle) != ILL_UNARY_OPCODE_X1)
                return 0;