UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230606132447.315714-7-npiggin@gmail.com
This commit is contained in:
Nicholas Piggin 2023-06-06 23:24:47 +10:00 committed by Michael Ellerman
parent afc6386815
commit 27be245633
3 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/powerpc/kernel/Makefile
View File

@ -165,9 +165,6 @@ endif
obj64-$(CONFIG_PPC_TRANSACTIONAL_MEM) += tm.o 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),) ifneq ($(CONFIG_XMON)$(CONFIG_KEXEC_CORE)(CONFIG_PPC_BOOK3S),)
obj-y += ppc_save_regs.o obj-y += ppc_save_regs.o
endif endif
@ -209,10 +206,13 @@ CFLAGS_paca.o += -fno-stack-protector
obj-$(CONFIG_PPC_FPU) += fpu.o obj-$(CONFIG_PPC_FPU) += fpu.o
obj-$(CONFIG_ALTIVEC) += vector.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 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 $@ quiet_cmd_prom_init_check = PROMCHK $@
cmd_prom_init_check = $(CONFIG_SHELL) $< "$(NM)" $(obj)/prom_init.o; touch $@ cmd_prom_init_check = $(CONFIG_SHELL) $< "$(NM)" $(obj)/prom_init.o; touch $@

30
arch/powerpc/kernel/entry_64.S → arch/powerpc/kernel/prom_entry_64.S
View File

@ -10,41 +10,17 @@
* Copyright (C) 1996 Paul Mackerras. * Copyright (C) 1996 Paul Mackerras.
* MPC8xx modifications Copyright (C) 1997 Dan Malek (dmalek@jlc.net). * MPC8xx modifications Copyright (C) 1997 Dan Malek (dmalek@jlc.net).
* *
* This file contains the system call entry code, context switch * This file contains the 64-bit prom entry code.
* code, and exception/interrupt return code for PowerPC.
*/ */
#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/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 #ifdef CONFIG_PPC_BOOK3S
#include <asm/exception-64s.h> #include <asm/exception-64s.h>
#else #else
#include <asm/exception-64e.h> #include <asm/exception-64e.h>
#endif #endif
#include <asm/feature-fixups.h> #include <asm/ppc_asm.h>
#include <asm/kup.h>
.section ".text" .section ".text","ax",@progbits
_GLOBAL(enter_prom) _GLOBAL(enter_prom)
mflr r0 mflr r0

2
scripts/head-object-list.txt
View File

@ -34,7 +34,7 @@ arch/powerpc/kernel/head_64.o
arch/powerpc/kernel/head_8xx.o arch/powerpc/kernel/head_8xx.o
arch/powerpc/kernel/head_85xx.o arch/powerpc/kernel/head_85xx.o
arch/powerpc/kernel/head_book3s_32.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/fpu.o
arch/powerpc/kernel/vector.o arch/powerpc/kernel/vector.o
arch/powerpc/kernel/prom_init.o arch/powerpc/kernel/prom_init.o