Skip to content

Commit 27e21e8

Browse files
chleroympe
authored andcommitted
powerpc/32: Remove _ENTRY() macro
_ENTRY() is now redundant with _GLOBAL(). Remove it. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/62a35f8dde2bb74c8d0d7a5430cce07a5a3a6fb6.1638273868.git.christophe.leroy@csgroup.eu
1 parent 1231816 commit 27e21e8

File tree

6 files changed

+20
-24
lines changed

6 files changed

+20
-24
lines changed

arch/powerpc/include/asm/ppc_asm.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,6 @@ GLUE(.,name):
203203

204204
#else /* 32-bit */
205205

206-
#define _ENTRY(n) \
207-
.globl n; \
208-
n:
209-
210206
#define _GLOBAL(n) \
211207
.globl n; \
212208
n:

arch/powerpc/kernel/head_40x.S

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
* This is all going to change RSN when we add bi_recs....... -- Dan
5454
*/
5555
__HEAD
56-
_ENTRY(_stext);
57-
_ENTRY(_start);
56+
_GLOBAL(_stext);
57+
_GLOBAL(_start);
5858

5959
mr r31,r3 /* save device tree ptr */
6060

@@ -82,19 +82,19 @@ turn_on_mmu:
8282
*/
8383
. = 0xc0
8484
crit_save:
85-
_ENTRY(crit_r10)
85+
_GLOBAL(crit_r10)
8686
.space 4
87-
_ENTRY(crit_r11)
87+
_GLOBAL(crit_r11)
8888
.space 4
89-
_ENTRY(crit_srr0)
89+
_GLOBAL(crit_srr0)
9090
.space 4
91-
_ENTRY(crit_srr1)
91+
_GLOBAL(crit_srr1)
9292
.space 4
93-
_ENTRY(crit_r1)
93+
_GLOBAL(crit_r1)
9494
.space 4
95-
_ENTRY(crit_dear)
95+
_GLOBAL(crit_dear)
9696
.space 4
97-
_ENTRY(crit_esr)
97+
_GLOBAL(crit_esr)
9898
.space 4
9999

100100
/*

arch/powerpc/kernel/head_44x.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
*
5353
*/
5454
__HEAD
55-
_ENTRY(_stext);
56-
_ENTRY(_start);
55+
_GLOBAL(_stext);
56+
_GLOBAL(_start);
5757
/*
5858
* Reserve a word at a fixed location to store the address
5959
* of abatron_pteptrs

arch/powerpc/kernel/head_8xx.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
#define PAGE_SHIFT_8M 23
5454

5555
__HEAD
56-
_ENTRY(_stext);
57-
_ENTRY(_start);
56+
_GLOBAL(_stext);
57+
_GLOBAL(_start);
5858

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

arch/powerpc/kernel/head_book3s_32.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@
5050
mtspr SPRN_DBAT##n##L,RB
5151

5252
__HEAD
53-
_ENTRY(_stext);
53+
_GLOBAL(_stext);
5454

5555
/*
5656
* _start is defined this way because the XCOFF loader in the OpenFirmware
5757
* on the powermac expects the entry point to be a procedure descriptor.
5858
*/
59-
_ENTRY(_start);
59+
_GLOBAL(_start);
6060
/*
6161
* These are here for legacy reasons, the kernel used to
6262
* need to look like a coff function entry for the pmac
@@ -775,7 +775,7 @@ relocate_kernel:
775775
* r3 = dest addr, r4 = source addr, r5 = copy limit, r6 = start offset
776776
* on exit, r3, r4, r5 are unchanged, r6 is updated to be >= r5.
777777
*/
778-
_ENTRY(copy_and_flush)
778+
_GLOBAL(copy_and_flush)
779779
addi r5,r5,-4
780780
addi r6,r6,-4
781781
4: li r0,L1_CACHE_BYTES/4
@@ -1073,7 +1073,7 @@ BEGIN_MMU_FTR_SECTION
10731073
END_MMU_FTR_SECTION_IFSET(MMU_FTR_USE_HIGH_BATS)
10741074
blr
10751075

1076-
_ENTRY(update_bats)
1076+
_GLOBAL(update_bats)
10771077
lis r4, 1f@h
10781078
ori r4, r4, 1f@l
10791079
tophys(r4, r4)

arch/powerpc/kernel/head_fsl_booke.S

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
*
5555
*/
5656
__HEAD
57-
_ENTRY(_stext);
58-
_ENTRY(_start);
57+
_GLOBAL(_stext);
58+
_GLOBAL(_start);
5959
/*
6060
* Reserve a word at a fixed location to store the address
6161
* of abatron_pteptrs
@@ -154,7 +154,7 @@ _ENTRY(_start);
154154
* if needed
155155
*/
156156

157-
_ENTRY(__early_start)
157+
_GLOBAL(__early_start)
158158
LOAD_REG_ADDR_PIC(r20, kernstart_virt_addr)
159159
lwz r20,0(r20)
160160

0 commit comments

Comments
 (0)