s390/disassembler: Remove duplicate instruction format RSY_RDRU

Instruction format RSY_RDRU is a duplicate of RSY_RURD2. Use the latter,
as it follows the s390-specific conventions for instruction format
naming used in binutils.

Reviewed-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Jens Remus <jremus@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/arch/s390/kernel/dis.c b/arch/s390/kernel/dis.c
index cc7e905d0ff4a717baf9a8aca97071d73557aa87..94eb8168ea44545f68ef21abdff339e2dcd11ff5 100644 (file)
--- a/arch/s390/kernel/dis.c
+++ b/arch/s390/kernel/dis.c
@@ -259,7 +259,6 @@ static const unsigned char formats[][6] = {
        [INSTR_RSL_R0RD]     = { D_20, L4_8, B_16, 0, 0, 0 },
        [INSTR_RSY_AARD]     = { A_8, A_12, D20_20, B_16, 0, 0 },
        [INSTR_RSY_CCRD]     = { C_8, C_12, D20_20, B_16, 0, 0 },
-       [INSTR_RSY_RDRU]     = { R_8, D20_20, B_16, U4_12, 0, 0 },
        [INSTR_RSY_RRRD]     = { R_8, R_12, D20_20, B_16, 0, 0 },
        [INSTR_RSY_RURD]     = { R_8, U4_12, D20_20, B_16, 0, 0 },
        [INSTR_RSY_RURD2]    = { R_8, D20_20, B_16, U4_12, 0, 0 },

diff --git a/arch/s390/tools/opcodes.txt b/arch/s390/tools/opcodes.txt
index b781e1f05c9af3f42c39d3406741923ae4d2d6aa..def2659f6602d2c5d4e1680367675e3908c137e8 100644 (file)
--- a/arch/s390/tools/opcodes.txt
+++ b/arch/s390/tools/opcodes.txt
@@ -1118,9 +1118,9 @@ eb54      niy     SIY_URD
 eb55   cliy    SIY_URD
 eb56   oiy     SIY_URD
 eb57   xiy     SIY_URD
-eb60   lric    RSY_RDRU
-eb61   stric   RSY_RDRU
-eb62   mric    RSY_RDRU
+eb60   lric    RSY_RURD2
+eb61   stric   RSY_RURD2
+eb62   mric    RSY_RURD2
 eb6a   asi     SIY_IRD
 eb6e   alsi    SIY_IRD
 eb71   lpswey  SIY_RD
@@ -1128,7 +1128,7 @@ eb7a      agsi    SIY_IRD
 eb7e   algsi   SIY_IRD
 eb80   icmh    RSY_RURD
 eb81   icmy    RSY_RURD
-eb8a   sqbs    RSY_RDRU
+eb8a   sqbs    RSY_RURD2
 eb8e   mvclu   RSY_RRRD
 eb8f   clclu   RSY_RRRD
 eb90   stmy    RSY_RRRD