Commit 27e21e8f authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/32: Remove _ENTRY() macro 



_ENTRY() is now redundant with _GLOBAL(). Remove it.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/62a35f8dde2bb74c8d0d7a5430cce07a5a3a6fb6.1638273868.git.christophe.leroy@csgroup.eu
parent 12318163

arch/powerpc/include/asm/ppc_asm.h

+0 −4
Original line number Diff line number Diff line
@@ -203,10 +203,6 @@ GLUE(.,name): 


#else /* 32-bit */



#define _ENTRY(n)	\

	.globl n;	\

n:



#define _GLOBAL(n)	\

	.globl n;	\

n:

arch/powerpc/kernel/head_40x.S

+9 −9
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ 
 * This is all going to change RSN when we add bi_recs.......  -- Dan

 */

	__HEAD

_ENTRY(_stext);

_ENTRY(_start);

_GLOBAL(_stext);

_GLOBAL(_start);



	mr	r31,r3			/* save device tree ptr */
@@ -82,19 +82,19 @@ turn_on_mmu: 
 */

	. = 0xc0

crit_save:

_ENTRY(crit_r10)

_GLOBAL(crit_r10)

	.space	4

_ENTRY(crit_r11)

_GLOBAL(crit_r11)

	.space	4

_ENTRY(crit_srr0)

_GLOBAL(crit_srr0)

	.space	4

_ENTRY(crit_srr1)

_GLOBAL(crit_srr1)

	.space	4

_ENTRY(crit_r1)

_GLOBAL(crit_r1)

	.space	4

_ENTRY(crit_dear)

_GLOBAL(crit_dear)

	.space	4

_ENTRY(crit_esr)

_GLOBAL(crit_esr)

	.space	4



/*

arch/powerpc/kernel/head_44x.S

+2 −2
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ 
 *

 */

	__HEAD

_ENTRY(_stext);

_ENTRY(_start);

_GLOBAL(_stext);

_GLOBAL(_start);

	/*

	 * Reserve a word at a fixed location to store the address

	 * of abatron_pteptrs

arch/powerpc/kernel/head_8xx.S

+2 −2
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ 
#define PAGE_SHIFT_8M		23



	__HEAD

_ENTRY(_stext);

_ENTRY(_start);

_GLOBAL(_stext);

_GLOBAL(_start);



/* MPC8xx

 * This port was done on an MBX board with an 860.  Right now I only

arch/powerpc/kernel/head_book3s_32.S

+4 −4
Original line number Diff line number Diff line
@@ -50,13 +50,13 @@ 
	mtspr	SPRN_DBAT##n##L,RB



	__HEAD

_ENTRY(_stext);

_GLOBAL(_stext);



/*

 * _start is defined this way because the XCOFF loader in the OpenFirmware

 * on the powermac expects the entry point to be a procedure descriptor.

 */

_ENTRY(_start);

_GLOBAL(_start);

	/*

	 * These are here for legacy reasons, the kernel used to

	 * need to look like a coff function entry for the pmac
@@ -775,7 +775,7 @@ relocate_kernel: 
 * r3 = dest addr, r4 = source addr, r5 = copy limit, r6 = start offset

 * on exit, r3, r4, r5 are unchanged, r6 is updated to be >= r5.

 */

_ENTRY(copy_and_flush)

_GLOBAL(copy_and_flush)

	addi	r5,r5,-4

	addi	r6,r6,-4

4:	li	r0,L1_CACHE_BYTES/4
@@ -1073,7 +1073,7 @@ BEGIN_MMU_FTR_SECTION 
END_MMU_FTR_SECTION_IFSET(MMU_FTR_USE_HIGH_BATS)

	blr



_ENTRY(update_bats)

_GLOBAL(update_bats)

	lis	r4, 1f@h

	ori	r4, r4, 1f@l

	tophys(r4, r4)