---

yaml --- r: 11569 b: refs/heads/master c: 7062018 h: refs/heads/master i: 11567: 20832d8 v: v3
git-mirror · Oct 12, 2005 · 927af21 · 927af21
1 parent f8a1276
commit 927af21
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4920960f577edcb0a5ef03823a53911cca5875e1
+refs/heads/master: 7062018687da3d5d4966f58d6f0a58528b1e331b
diff --git a/trunk/arch/powerpc/kernel/misc_32.S b/trunk/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/trunk/include/asm-powerpc/ppc_asm.h b/trunk/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