diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-05-27 23:30:12 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-05-27 23:30:12 -0400 |
| commit | 86969cf7330a53c93edfd1bf2c28ad053e289162 (patch) | |
| tree | a69d5408f126d21c6cae84a0fb44e9a33da0acd0 /arch/powerpc/include/asm | |
| parent | b9d800959e87e538595a723f07dd3829c2f85d85 (diff) | |
| parent | 011e4b02f1da156ac7fea28a9da878f3c23af739 (diff) | |
Merge branch 'merge' into next
Merge the binutils and kexec fixes.
Diffstat (limited to 'arch/powerpc/include/asm')
| -rw-r--r-- | arch/powerpc/include/asm/ppc_asm.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h index 6400f1814fe8..9ea266eae33e 100644 --- a/arch/powerpc/include/asm/ppc_asm.h +++ b/arch/powerpc/include/asm/ppc_asm.h | |||
| @@ -322,11 +322,16 @@ n: | |||
| 322 | addi reg,reg,(name - 0b)@l; | 322 | addi reg,reg,(name - 0b)@l; |
| 323 | 323 | ||
| 324 | #ifdef __powerpc64__ | 324 | #ifdef __powerpc64__ |
| 325 | #ifdef HAVE_AS_ATHIGH | ||
| 326 | #define __AS_ATHIGH high | ||
| 327 | #else | ||
| 328 | #define __AS_ATHIGH h | ||
| 329 | #endif | ||
| 325 | #define LOAD_REG_IMMEDIATE(reg,expr) \ | 330 | #define LOAD_REG_IMMEDIATE(reg,expr) \ |
| 326 | lis reg,(expr)@highest; \ | 331 | lis reg,(expr)@highest; \ |
| 327 | ori reg,reg,(expr)@higher; \ | 332 | ori reg,reg,(expr)@higher; \ |
| 328 | rldicr reg,reg,32,31; \ | 333 | rldicr reg,reg,32,31; \ |
| 329 | oris reg,reg,(expr)@h; \ | 334 | oris reg,reg,(expr)@__AS_ATHIGH; \ |
| 330 | ori reg,reg,(expr)@l; | 335 | ori reg,reg,(expr)@l; |
| 331 | 336 | ||
| 332 | #define LOAD_REG_ADDR(reg,name) \ | 337 | #define LOAD_REG_ADDR(reg,name) \ |