Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 564aa5cf authored by Michael Neuling's avatar Michael Neuling Committed by Benjamin Herrenschmidt
Browse files

powerpc: Modify macro ready for %r0 register change 



The assembler doesn't take %r0 register arguments in braces, so remove them.

Signed-off-by: default avatarMichael Neuling <mikey@neuling.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 82fff310

arch/powerpc/include/asm/ppc_asm.h

+9 −9
Original line number Diff line number Diff line
@@ -295,14 +295,14 @@ GLUE(.,name): 
 */

#ifdef __powerpc64__

#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;		\

	ori     (reg),(reg),(expr)@l;

	lis     reg,(expr)@highest;		\

	ori     reg,reg,(expr)@higher;	\

	rldicr  reg,reg,32,31;		\

	oris    reg,reg,(expr)@h;		\

	ori     reg,reg,(expr)@l;



#define LOAD_REG_ADDR(reg,name)			\

	ld	(reg),name@got(r2)

	ld	reg,name@got(r2)



#define LOAD_REG_ADDRBASE(reg,name)	LOAD_REG_ADDR(reg,name)

#define ADDROFF(name)			0
@@ -313,12 +313,12 @@ GLUE(.,name): 
#else /* 32-bit */



#define LOAD_REG_IMMEDIATE(reg,expr)		\

	lis	(reg),(expr)@ha;		\

	addi	(reg),(reg),(expr)@l;

	lis	reg,(expr)@ha;		\

	addi	reg,reg,(expr)@l;



#define LOAD_REG_ADDR(reg,name)		LOAD_REG_IMMEDIATE(reg, name)



#define LOAD_REG_ADDRBASE(reg, name)	lis	(reg),name@ha

#define LOAD_REG_ADDRBASE(reg, name)	lis	reg,name@ha

#define ADDROFF(name)			name@l



/* offsets for stack frame layout */