diff options
-rw-r--r-- | arch/powerpc/include/asm/ppc-opcode.h | 7 | ||||
-rw-r--r-- | arch/powerpc/kernel/misc_64.S | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/arch/powerpc/include/asm/ppc-opcode.h b/arch/powerpc/include/asm/ppc-opcode.h index 015a3289e222..73eecd1fd5cc 100644 --- a/arch/powerpc/include/asm/ppc-opcode.h +++ b/arch/powerpc/include/asm/ppc-opcode.h | |||
@@ -140,6 +140,8 @@ | |||
140 | #define PPC_INST_NEG 0x7c0000d0 | 140 | #define PPC_INST_NEG 0x7c0000d0 |
141 | #define PPC_INST_BRANCH 0x48000000 | 141 | #define PPC_INST_BRANCH 0x48000000 |
142 | #define PPC_INST_BRANCH_COND 0x40800000 | 142 | #define PPC_INST_BRANCH_COND 0x40800000 |
143 | #define PPC_INST_LBZCIX 0x7c0006aa | ||
144 | #define PPC_INST_STBCIX 0x7c0007aa | ||
143 | 145 | ||
144 | /* macros to insert fields into opcodes */ | 146 | /* macros to insert fields into opcodes */ |
145 | #define __PPC_RA(a) (((a) & 0x1f) << 16) | 147 | #define __PPC_RA(a) (((a) & 0x1f) << 16) |
@@ -219,6 +221,11 @@ | |||
219 | __PPC_RS(t) | __PPC_RA(a) | __PPC_RB(b)) | 221 | __PPC_RS(t) | __PPC_RA(a) | __PPC_RB(b)) |
220 | #define PPC_SLBFEE_DOT(t, b) stringify_in_c(.long PPC_INST_SLBFEE | \ | 222 | #define PPC_SLBFEE_DOT(t, b) stringify_in_c(.long PPC_INST_SLBFEE | \ |
221 | __PPC_RT(t) | __PPC_RB(b)) | 223 | __PPC_RT(t) | __PPC_RB(b)) |
224 | /* PASemi instructions */ | ||
225 | #define LBZCIX(t,a,b) stringify_in_c(.long PPC_INST_LBZCIX | \ | ||
226 | __PPC_RT(t) | __PPC_RA(a) | __PPC_RB(b)) | ||
227 | #define STBCIX(s,a,b) stringify_in_c(.long PPC_INST_STBCIX | \ | ||
228 | __PPC_RS(s) | __PPC_RA(a) | __PPC_RB(b)) | ||
222 | 229 | ||
223 | /* | 230 | /* |
224 | * Define what the VSX XX1 form instructions will look like, then add | 231 | * Define what the VSX XX1 form instructions will look like, then add |
diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S index 6ba08bc91b21..f52f9b949fd7 100644 --- a/arch/powerpc/kernel/misc_64.S +++ b/arch/powerpc/kernel/misc_64.S | |||
@@ -301,11 +301,6 @@ _GLOBAL(real_writeb) | |||
301 | 301 | ||
302 | #ifdef CONFIG_PPC_PASEMI | 302 | #ifdef CONFIG_PPC_PASEMI |
303 | 303 | ||
304 | /* No support in all binutils for these yet, so use defines */ | ||
305 | #define LBZCIX(RT,RA,RB) .long (0x7c0006aa|(RT<<21)|(RA<<16)|(RB << 11)) | ||
306 | #define STBCIX(RS,RA,RB) .long (0x7c0007aa|(RS<<21)|(RA<<16)|(RB << 11)) | ||
307 | |||
308 | |||
309 | _GLOBAL(real_205_readb) | 304 | _GLOBAL(real_205_readb) |
310 | mfmsr r7 | 305 | mfmsr r7 |
311 | ori r0,r7,MSR_DR | 306 | ori r0,r7,MSR_DR |