Commit 27be2456 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc/64: Rename entry_64.S to prom_entry_64.S 



This file contains only the enter_prom implementation now.
Trim includes and update header comment while we're here.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230606132447.315714-7-npiggin@gmail.com
parent afc63868

arch/powerpc/kernel/Makefile

+6 −6
Original line number Diff line number Diff line
@@ -165,9 +165,6 @@ endif 


obj64-$(CONFIG_PPC_TRANSACTIONAL_MEM)	+= tm.o



obj-$(CONFIG_PPC64)		+= $(obj64-y)

obj-$(CONFIG_PPC32)		+= $(obj32-y)



ifneq ($(CONFIG_XMON)$(CONFIG_KEXEC_CORE)(CONFIG_PPC_BOOK3S),)

obj-y				+= ppc_save_regs.o

endif
@@ -209,11 +206,14 @@ 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



obj-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_init.o

obj64-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_entry_64.o

extra-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_init_check



obj-$(CONFIG_PPC64)		+= $(obj64-y)

obj-$(CONFIG_PPC32)		+= $(obj32-y)



quiet_cmd_prom_init_check = PROMCHK $@

      cmd_prom_init_check = $(CONFIG_SHELL) $< "$(NM)" $(obj)/prom_init.o; touch $@

arch/powerpc/kernel/entry_64.S→arch/powerpc/kernel/prom_entry_64.S

+3 −27
Original line number Diff line number Diff line
@@ -10,41 +10,17 @@ 
 *    Copyright (C) 1996 Paul Mackerras.

 *  MPC8xx modifications Copyright (C) 1997 Dan Malek (dmalek@jlc.net).

 *

 *  This file contains the system call entry code, context switch

 *  code, and exception/interrupt return code for PowerPC.

 *  This file contains the 64-bit prom entry code.

 */



#include <linux/errno.h>

#include <linux/err.h>

#include <asm/cache.h>

#include <asm/unistd.h>

#include <asm/processor.h>

#include <asm/page.h>

#include <asm/mmu.h>

#include <asm/thread_info.h>

#include <asm/code-patching-asm.h>

#include <asm/ppc_asm.h>

#include <asm/asm-offsets.h>

#include <asm/cputable.h>

#include <asm/firmware.h>

#include <asm/bug.h>

#include <asm/ptrace.h>

#include <asm/irqflags.h>

#include <asm/hw_irq.h>

#include <asm/context_tracking.h>

#include <asm/ppc-opcode.h>

#include <asm/barrier.h>

#include <asm/export.h>

#include <asm/asm-compat.h>

#ifdef CONFIG_PPC_BOOK3S

#include <asm/exception-64s.h>

#else

#include <asm/exception-64e.h>

#endif

#include <asm/feature-fixups.h>

#include <asm/kup.h>

#include <asm/ppc_asm.h>



	.section	".text"

.section ".text","ax",@progbits



_GLOBAL(enter_prom)

	mflr	r0

scripts/head-object-list.txt

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ arch/powerpc/kernel/head_64.o 
arch/powerpc/kernel/head_8xx.o

arch/powerpc/kernel/head_85xx.o

arch/powerpc/kernel/head_book3s_32.o

arch/powerpc/kernel/entry_64.o

arch/powerpc/kernel/prom_entry_64.o

arch/powerpc/kernel/fpu.o

arch/powerpc/kernel/vector.o

arch/powerpc/kernel/prom_init.o