[PATCH 2/2] powerpc/64: Rename entry_64.S to prom_entry.S

[Christophe Leroy]

Le 28/03/2023 à 08:51, Nicholas Piggin a écrit :
> On Tue Mar 28, 2023 at 3:48 AM AEST, Christophe Leroy wrote:
>>
>>
>> Le 25/03/2023 à 14:06, Nicholas Piggin a écrit :
>>> This file contains only the enter_prom implementation now.
>>> Trim includes and update header comment while we're here.
>>>
>>> Signed-off-by: Nicholas Piggin <npiggin at gmail.com>
>>> ---
>>>    arch/powerpc/kernel/Makefile                  |  8 +++--
>>>    .../kernel/{entry_64.S => prom_entry.S}       | 30 ++-----------------
>>>    scripts/head-object-list.txt                  |  2 +-
>>>    3 files changed, 9 insertions(+), 31 deletions(-)
>>>    rename arch/powerpc/kernel/{entry_64.S => prom_entry.S} (73%)
>>>
>>> diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
>>> index ec70a1748506..ebba0896998a 100644
>>> --- a/arch/powerpc/kernel/Makefile
>>> +++ b/arch/powerpc/kernel/Makefile
>>> @@ -209,10 +209,12 @@ CFLAGS_paca.o			+= -fno-stack-protector
>>>    
>>>    obj-$(CONFIG_PPC_FPU)		+= fpu.o
>>>    obj-$(CONFIG_ALTIVEC)		+= vector.o
>>> -obj-$(CONFIG_PPC64)		+= entry_64.o
>>> -obj-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE)	+= prom_init.o
>>>    
>>> -extra-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE)	+= prom_init_check
>>> +ifdef CONFIG_PPC_OF_BOOT_TRAMPOLINE
>>
>> You don't need that ifdef construct, you can do:
>>
>> obj64-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_entry.o
> 
> Nice. So that could have been obj64-y from the start?

Yes, allthought it is not used that way in ppc/kernel/Makefile:

$ git grep -e obj64 -e obj32 arch/powerpc/kernel/Makefile
arch/powerpc/kernel/Makefile:obj64-$(CONFIG_HIBERNATION)        += 
swsusp_asm64.o
arch/powerpc/kernel/Makefile:obj64-$(CONFIG_AUDIT)              += 
compat_audit.o
arch/powerpc/kernel/Makefile:obj64-$(CONFIG_PPC_TRANSACTIONAL_MEM) 
+= tm.o
arch/powerpc/kernel/Makefile:obj-$(CONFIG_PPC64)                += 
$(obj64-y)
arch/powerpc/kernel/Makefile:obj-$(CONFIG_PPC32)                += 
$(obj32-y)

But it is in ppc/lib/Makefile:

$ git grep -e obj64 -e obj32 arch/powerpc/lib/Makefile
arch/powerpc/lib/Makefile:obj64-y       += copypage_64.o copyuser_64.o 
mem_64.o hweight_64.o \
arch/powerpc/lib/Makefile:obj64-$(CONFIG_SMP)   += locks.o
arch/powerpc/lib/Makefile:obj64-$(CONFIG_ALTIVEC)       += vmx-helper.o
arch/powerpc/lib/Makefile:obj64-$(CONFIG_KPROBES_SANITY_TEST)   += 
test_emulate_step.o \
arch/powerpc/lib/Makefile:obj64-y                       += quad.o
arch/powerpc/lib/Makefile:obj-$(CONFIG_PPC64) += $(obj64-y)

Christophe