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

Commit b1576fec authored by Anton Blanchard's avatar Anton Blanchard
Browse files

powerpc: No need to use dot symbols when branching to a function 



binutils is smart enough to know that a branch to a function
descriptor is actually a branch to the functions text address.

Alan tells me that binutils has been doing this for 9 years.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
parent 58aedccb

arch/powerpc/boot/util.S

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ udelay: 
	mfspr	r4,SPRN_PVR

	srwi	r4,r4,16

	cmpwi	0,r4,1		/* 601 ? */

	bne	.udelay_not_601

	bne	.Ludelay_not_601

00:	li	r0,86	/* Instructions / microsecond? */

	mtctr	r0

10:	addi	r0,r0,0 /* NOP */
@@ -54,7 +54,7 @@ udelay: 
	bne	00b

	blr



.udelay_not_601:

.Ludelay_not_601:

	mulli	r4,r3,1000	/* nanoseconds */

	/*  Change r4 to be the number of ticks using:

	 *	(nanoseconds + (timebase_period_ns - 1 )) / timebase_period_ns

arch/powerpc/include/asm/context_tracking.h

+2 −2
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ 
#define _ASM_POWERPC_CONTEXT_TRACKING_H



#ifdef CONFIG_CONTEXT_TRACKING

#define SCHEDULE_USER bl	.schedule_user

#define SCHEDULE_USER bl	schedule_user

#else

#define SCHEDULE_USER bl	.schedule

#define SCHEDULE_USER bl	schedule

#endif



#endif

arch/powerpc/include/asm/exception-64e.h

+3 −3
Original line number Diff line number Diff line
@@ -174,10 +174,10 @@ exc_##label##_book3e: 
	mtlr	r16;

#define TLB_MISS_STATS_D(name)						    \

	addi	r9,r13,MMSTAT_DSTATS+name;				    \

	bl	.tlb_stat_inc;

	bl	tlb_stat_inc;

#define TLB_MISS_STATS_I(name)						    \

	addi	r9,r13,MMSTAT_ISTATS+name;				    \

	bl	.tlb_stat_inc;

	bl	tlb_stat_inc;

#define TLB_MISS_STATS_X(name)						    \

	ld	r8,PACA_EXTLB+EX_TLB_ESR(r13);				    \

	cmpdi	cr2,r8,-1;						    \
@@ -185,7 +185,7 @@ exc_##label##_book3e: 
	addi	r9,r13,MMSTAT_DSTATS+name;				    \

	b	62f;							    \

61:	addi	r9,r13,MMSTAT_ISTATS+name;				    \

62:	bl	.tlb_stat_inc;

62:	bl	tlb_stat_inc;

#define TLB_MISS_STATS_SAVE_INFO					    \

	std	r14,EX_TLB_ESR(r12);	/* save ESR */

#define TLB_MISS_STATS_SAVE_INFO_BOLTED					    \

arch/powerpc/include/asm/exception-64s.h

+1 −1
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ label##_relon_hv: \ 
#define DISABLE_INTS	RECONCILE_IRQ_STATE(r10,r11)



#define ADD_NVGPRS				\

	bl	.save_nvgprs

	bl	save_nvgprs



#define RUNLATCH_ON				\

BEGIN_FTR_SECTION				\

arch/powerpc/include/asm/irqflags.h

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ 
 * have to call a C function so call a wrapper that saves all the

 * C-clobbered registers.

 */

#define TRACE_ENABLE_INTS	TRACE_WITH_FRAME_BUFFER(.trace_hardirqs_on)

#define TRACE_DISABLE_INTS	TRACE_WITH_FRAME_BUFFER(.trace_hardirqs_off)

#define TRACE_ENABLE_INTS	TRACE_WITH_FRAME_BUFFER(trace_hardirqs_on)

#define TRACE_DISABLE_INTS	TRACE_WITH_FRAME_BUFFER(trace_hardirqs_off)



/*

 * This is used by assembly code to soft-disable interrupts first and