Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Michael Neuling and committed by
Benjamin Herrenschmidt
564aa5cf 82fff310

+9 -9
+9 -9
arch/powerpc/include/asm/ppc_asm.h
··· 295 295 */ 296 296 #ifdef __powerpc64__ 297 297 #define LOAD_REG_IMMEDIATE(reg,expr) \ 298 - lis (reg),(expr)@highest; \ 299 - ori (reg),(reg),(expr)@higher; \ 300 - rldicr (reg),(reg),32,31; \ 301 - oris (reg),(reg),(expr)@h; \ 302 - ori (reg),(reg),(expr)@l; 298 + lis reg,(expr)@highest; \ 299 + ori reg,reg,(expr)@higher; \ 300 + rldicr reg,reg,32,31; \ 301 + oris reg,reg,(expr)@h; \ 302 + ori reg,reg,(expr)@l; 303 303 304 304 #define LOAD_REG_ADDR(reg,name) \ 305 - ld (reg),name@got(r2) 305 + ld reg,name@got(r2) 306 306 307 307 #define LOAD_REG_ADDRBASE(reg,name) LOAD_REG_ADDR(reg,name) 308 308 #define ADDROFF(name) 0 ··· 313 313 #else /* 32-bit */ 314 314 315 315 #define LOAD_REG_IMMEDIATE(reg,expr) \ 316 - lis (reg),(expr)@ha; \ 317 - addi (reg),(reg),(expr)@l; 316 + lis reg,(expr)@ha; \ 317 + addi reg,reg,(expr)@l; 318 318 319 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 322 #define ADDROFF(name) name@l 323 323 324 324 /* offsets for stack frame layout */