diff options
author | Michael Neuling <mikey@neuling.org> | 2012-06-25 09:33:09 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-07-10 05:17:52 -0400 |
commit | 564aa5cfd3e33ef69a5ca6c170a0fe79c6805e52 (patch) | |
tree | 5a6e5478b168f4e9c0f09a334f3d9d75c8a803b4 /arch/powerpc/include/asm/ppc_asm.h | |
parent | 82fff310f18e274a8e3f0aff5669928ab45c8dab (diff) |
powerpc: Modify macro ready for %r0 register change
The assembler doesn't take %r0 register arguments in braces, so remove them.
Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/include/asm/ppc_asm.h')
-rw-r--r-- | arch/powerpc/include/asm/ppc_asm.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h index 15444204a3a1..19205f5cbaca 100644 --- a/arch/powerpc/include/asm/ppc_asm.h +++ b/arch/powerpc/include/asm/ppc_asm.h | |||
@@ -295,14 +295,14 @@ n: | |||
295 | */ | 295 | */ |
296 | #ifdef __powerpc64__ | 296 | #ifdef __powerpc64__ |
297 | #define LOAD_REG_IMMEDIATE(reg,expr) \ | 297 | #define LOAD_REG_IMMEDIATE(reg,expr) \ |
298 | lis (reg),(expr)@highest; \ | 298 | lis reg,(expr)@highest; \ |
299 | ori (reg),(reg),(expr)@higher; \ | 299 | ori reg,reg,(expr)@higher; \ |
300 | rldicr (reg),(reg),32,31; \ | 300 | rldicr reg,reg,32,31; \ |
301 | oris (reg),(reg),(expr)@h; \ | 301 | oris reg,reg,(expr)@h; \ |
302 | ori (reg),(reg),(expr)@l; | 302 | ori reg,reg,(expr)@l; |
303 | 303 | ||
304 | #define LOAD_REG_ADDR(reg,name) \ | 304 | #define LOAD_REG_ADDR(reg,name) \ |
305 | ld (reg),name@got(r2) | 305 | ld reg,name@got(r2) |
306 | 306 | ||
307 | #define LOAD_REG_ADDRBASE(reg,name) LOAD_REG_ADDR(reg,name) | 307 | #define LOAD_REG_ADDRBASE(reg,name) LOAD_REG_ADDR(reg,name) |
308 | #define ADDROFF(name) 0 | 308 | #define ADDROFF(name) 0 |
@@ -313,12 +313,12 @@ n: | |||
313 | #else /* 32-bit */ | 313 | #else /* 32-bit */ |
314 | 314 | ||
315 | #define LOAD_REG_IMMEDIATE(reg,expr) \ | 315 | #define LOAD_REG_IMMEDIATE(reg,expr) \ |
316 | lis (reg),(expr)@ha; \ | 316 | lis reg,(expr)@ha; \ |
317 | addi (reg),(reg),(expr)@l; | 317 | addi reg,reg,(expr)@l; |
318 | 318 | ||
319 | #define LOAD_REG_ADDR(reg,name) LOAD_REG_IMMEDIATE(reg, name) | 319 | #define LOAD_REG_ADDR(reg,name) LOAD_REG_IMMEDIATE(reg, name) |
320 | 320 | ||
321 | #define LOAD_REG_ADDRBASE(reg, name) lis (reg),name@ha | 321 | #define LOAD_REG_ADDRBASE(reg, name) lis reg,name@ha |
322 | #define ADDROFF(name) name@l | 322 | #define ADDROFF(name) name@l |
323 | 323 | ||
324 | /* offsets for stack frame layout */ | 324 | /* offsets for stack frame layout */ |