浏览代码

powerpc: create 32 bit LOADADDR macro

and use it in misc_32.S

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Stephen Rothwell 19 年之前
父节点
当前提交
7062018687
共有 2 个文件被更改,包括 6 次插入4 次删除
  1. 2 4
      arch/powerpc/kernel/misc_32.S
  2. 4 0
      include/asm-powerpc/ppc_asm.h

+ 2 - 4
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

+ 4 - 0
include/asm-powerpc/ppc_asm.h

@@ -193,6 +193,10 @@ n:
 #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