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

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
...@@ -203,10 +203,6 @@ GLUE(.,name): ...@@ -203,10 +203,6 @@ GLUE(.,name):
#else /* 32-bit */ #else /* 32-bit */
#define _ENTRY(n) \
.globl n; \
n:
#define _GLOBAL(n) \ #define _GLOBAL(n) \
.globl n; \ .globl n; \
n: n:
......
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
* This is all going to change RSN when we add bi_recs....... -- Dan * This is all going to change RSN when we add bi_recs....... -- Dan
*/ */
__HEAD __HEAD
_ENTRY(_stext); _GLOBAL(_stext);
_ENTRY(_start); _GLOBAL(_start);
mr r31,r3 /* save device tree ptr */ mr r31,r3 /* save device tree ptr */
...@@ -82,19 +82,19 @@ turn_on_mmu: ...@@ -82,19 +82,19 @@ turn_on_mmu:
*/ */
. = 0xc0 . = 0xc0
crit_save: crit_save:
_ENTRY(crit_r10) _GLOBAL(crit_r10)
.space 4 .space 4
_ENTRY(crit_r11) _GLOBAL(crit_r11)
.space 4 .space 4
_ENTRY(crit_srr0) _GLOBAL(crit_srr0)
.space 4 .space 4
_ENTRY(crit_srr1) _GLOBAL(crit_srr1)
.space 4 .space 4
_ENTRY(crit_r1) _GLOBAL(crit_r1)
.space 4 .space 4
_ENTRY(crit_dear) _GLOBAL(crit_dear)
.space 4 .space 4
_ENTRY(crit_esr) _GLOBAL(crit_esr)
.space 4 .space 4
/* /*
......
...@@ -52,8 +52,8 @@ ...@@ -52,8 +52,8 @@
* *
*/ */
__HEAD __HEAD
_ENTRY(_stext); _GLOBAL(_stext);
_ENTRY(_start); _GLOBAL(_start);
/* /*
* Reserve a word at a fixed location to store the address * Reserve a word at a fixed location to store the address
* of abatron_pteptrs * of abatron_pteptrs
......
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
#define PAGE_SHIFT_8M 23 #define PAGE_SHIFT_8M 23
__HEAD __HEAD
_ENTRY(_stext); _GLOBAL(_stext);
_ENTRY(_start); _GLOBAL(_start);
/* MPC8xx /* MPC8xx
* This port was done on an MBX board with an 860. Right now I only * This port was done on an MBX board with an 860. Right now I only
......
...@@ -50,13 +50,13 @@ ...@@ -50,13 +50,13 @@
mtspr SPRN_DBAT##n##L,RB mtspr SPRN_DBAT##n##L,RB
__HEAD __HEAD
_ENTRY(_stext); _GLOBAL(_stext);
/* /*
* _start is defined this way because the XCOFF loader in the OpenFirmware * _start is defined this way because the XCOFF loader in the OpenFirmware
* on the powermac expects the entry point to be a procedure descriptor. * 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 * These are here for legacy reasons, the kernel used to
* need to look like a coff function entry for the pmac * need to look like a coff function entry for the pmac
...@@ -775,7 +775,7 @@ relocate_kernel: ...@@ -775,7 +775,7 @@ relocate_kernel:
* r3 = dest addr, r4 = source addr, r5 = copy limit, r6 = start offset * 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. * 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 r5,r5,-4
addi r6,r6,-4 addi r6,r6,-4
4: li r0,L1_CACHE_BYTES/4 4: li r0,L1_CACHE_BYTES/4
...@@ -1073,7 +1073,7 @@ BEGIN_MMU_FTR_SECTION ...@@ -1073,7 +1073,7 @@ BEGIN_MMU_FTR_SECTION
END_MMU_FTR_SECTION_IFSET(MMU_FTR_USE_HIGH_BATS) END_MMU_FTR_SECTION_IFSET(MMU_FTR_USE_HIGH_BATS)
blr blr
_ENTRY(update_bats) _GLOBAL(update_bats)
lis r4, 1f@h lis r4, 1f@h
ori r4, r4, 1f@l ori r4, r4, 1f@l
tophys(r4, r4) tophys(r4, r4)
......
...@@ -54,8 +54,8 @@ ...@@ -54,8 +54,8 @@
* *
*/ */
__HEAD __HEAD
_ENTRY(_stext); _GLOBAL(_stext);
_ENTRY(_start); _GLOBAL(_start);
/* /*
* Reserve a word at a fixed location to store the address * Reserve a word at a fixed location to store the address
* of abatron_pteptrs * of abatron_pteptrs
...@@ -154,7 +154,7 @@ _ENTRY(_start); ...@@ -154,7 +154,7 @@ _ENTRY(_start);
* if needed * if needed
*/ */
_ENTRY(__early_start) _GLOBAL(__early_start)
LOAD_REG_ADDR_PIC(r20, kernstart_virt_addr) LOAD_REG_ADDR_PIC(r20, kernstart_virt_addr)
lwz r20,0(r20) lwz r20,0(r20)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment