Commit 70620186 authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files

powerpc: create 32 bit LOADADDR macro 



and use it in misc_32.S

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent 4920960f

arch/powerpc/kernel/misc_32.S

+2 −4
Original line number Diff line number Diff line
@@ -43,8 +43,7 @@ _GLOBAL(reloc_offset) 
	mflr	r0

	bl	1f

1:	mflr	r3

	lis	r4,1b@ha

	addi	r4,r4,1b@l

	LOADADDR(r4,1b)

	subf	r3,r4,r3

	mtlr	r0

	blr
@@ -56,8 +55,7 @@ _GLOBAL(add_reloc_offset) 
	mflr	r0

	bl	1f

1:	mflr	r5

	lis	r4,1b@ha

	addi	r4,r4,1b@l

	LOADADDR(r4,1b)

	subf	r5,r4,r5

	add	r3,r3,r5

	mtlr	r0

include/asm-powerpc/ppc_asm.h

+4 −0
Original line number Diff line number Diff line
@@ -193,6 +193,10 @@ GLUE(.,name): 
#define CMPI	cmpdi



#else /* 32-bit */

#define LOADADDR(rn,name) \

	lis	rn,name@ha	\

	addi	rn,rn,name@l



#define LOADBASE(rn,name)	\

	lis	rn,name@ha