diff options
| author | Paul Mackerras <paulus@ozlabs.org> | 2017-08-30 14:12:24 +1000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-11-26 13:51:06 +0000 |
| commit | 5abbd54557e1d841669b35c10558e1556d6a32c2 (patch) | |
| tree | 3f653917a3deff9909e62b69154a3d7ec5096211 | |
| parent | c82575e660913d358714ab1a3123f497318b73a3 (diff) | |
| download | linux-5abbd54557e1d841669b35c10558e1556d6a32c2.tar.gz linux-5abbd54557e1d841669b35c10558e1556d6a32c2.tar.bz2 linux-5abbd54557e1d841669b35c10558e1556d6a32c2.zip | |
powerpc: Correct instruction code for xxlor instruction
commit 93b2d3cf3733b4060d3623161551f51ea1ab5499 upstream.
The instruction code for xxlor that commit 0016a4cf5582 ("powerpc:
Emulate most Book I instructions in emulate_step()", 2010-06-15)
added is actually the code for xxlnor. It is used in get_vsr()
and put_vsr() and the effect of the error is that if emulate_step
is used to emulate a VSX load or store from any register other
than vsr0, the bitwise complement of the correct value will be
loaded or stored. This corrects the error.
Fixes: 0016a4cf5582 ("powerpc: Emulate most Book I instructions in emulate_step()")
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | arch/powerpc/include/asm/ppc-opcode.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/ppc-opcode.h b/arch/powerpc/include/asm/ppc-opcode.h index c8d7f2442620..208d4e5a847a 100644 --- a/arch/powerpc/include/asm/ppc-opcode.h +++ b/arch/powerpc/include/asm/ppc-opcode.h @@ -58,7 +58,7 @@ #define PPC_INST_WAIT 0x7c00007c #define PPC_INST_TLBIVAX 0x7c000624 #define PPC_INST_TLBSRX_DOT 0x7c0006a5 -#define PPC_INST_XXLOR 0xf0000510 +#define PPC_INST_XXLOR 0xf0000490 #define PPC_INST_NAP 0x4c000364 #define PPC_INST_SLEEP 0x4c0003a4 |