powerpc: create 32 bit LOADADDR macro

and use it in misc_32.S Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
git-mirror · Oct 12, 2005 · 7062018 · 7062018
1 parent 4920960
commit 7062018
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S
@@ -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

diff --git a/include/asm-powerpc/ppc_asm.h b/include/asm-powerpc/ppc_asm.h
@@ -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