diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-05-28 13:30:12 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-05-28 13:30:12 +1000 |
| commit | 86969cf7330a53c93edfd1bf2c28ad053e289162 (patch) | |
| tree | a69d5408f126d21c6cae84a0fb44e9a33da0acd0 /arch/powerpc/include | |
| parent | b9d800959e87e538595a723f07dd3829c2f85d85 (diff) | |
| parent | 011e4b02f1da156ac7fea28a9da878f3c23af739 (diff) | |
| download | linux-86969cf7330a53c93edfd1bf2c28ad053e289162.tar.gz linux-86969cf7330a53c93edfd1bf2c28ad053e289162.tar.bz2 linux-86969cf7330a53c93edfd1bf2c28ad053e289162.zip | |
Merge branch 'merge' into next
Merge the binutils and kexec fixes.
Diffstat (limited to 'arch/powerpc/include')
| -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: addi reg,reg,(name - 0b)@l; #ifdef __powerpc64__ +#ifdef HAVE_AS_ATHIGH +#define __AS_ATHIGH high +#else +#define __AS_ATHIGH h +#endif #define LOAD_REG_IMMEDIATE(reg,expr) \ lis reg,(expr)@highest; \ ori reg,reg,(expr)@higher; \ rldicr reg,reg,32,31; \ - oris reg,reg,(expr)@h; \ + oris reg,reg,(expr)@__AS_ATHIGH; \ ori reg,reg,(expr)@l; #define LOAD_REG_ADDR(reg,name) \ |