hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[POWERPC] Make kexec_setup() a regular initcall 

There's no reason kexec_setup() needs to be called explicitly from
setup_system(), it can just be a regular initcall.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Michael Ellerman 2006-06-23 18:17:32 +10:00 committed by Paul Mackerras
parent c30a4df3f1
commit aa98c50dcb
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/kernel/machine_kexec_64.c
View File

@ -378,11 +378,13 @@ static void __init export_crashk_values(void)
of_node_put(node); of_node_put(node);
} }
void __init kexec_setup(void) static int __init kexec_setup(void)
{ {
export_htab_values(); export_htab_values();
export_crashk_values(); export_crashk_values();
return 0;
} }
__initcall(kexec_setup);
static int __init early_parse_crashk(char *p) static int __init early_parse_crashk(char *p)
{ {

4
arch/powerpc/kernel/setup_64.c
View File

@ -350,10 +350,6 @@ void __init setup_system(void)
*/ */
unflatten_device_tree(); unflatten_device_tree();
#ifdef CONFIG_KEXEC
kexec_setup(); /* requires unflattened device tree. */
#endif
/* /*
* Fill the ppc64_caches & systemcfg structures with informations * Fill the ppc64_caches & systemcfg structures with informations
* retrieved from the device-tree. Need to be called before * retrieved from the device-tree. Need to be called before

1
include/asm-powerpc/kexec.h
View File

@ -112,7 +112,6 @@ static inline void crash_setup_regs(struct pt_regs *newregs,
#ifdef __powerpc64__ #ifdef __powerpc64__
extern void kexec_smp_wait(void); /* get and clear naca physid, wait for extern void kexec_smp_wait(void); /* get and clear naca physid, wait for
master to copy new code to 0 */ master to copy new code to 0 */
extern void __init kexec_setup(void);
extern int crashing_cpu; extern int crashing_cpu;
extern void crash_send_ipi(void (*crash_ipi_callback)(struct pt_regs *)); extern void crash_send_ipi(void (*crash_ipi_callback)(struct pt_regs *));
#endif /* __powerpc64 __ */ #endif /* __powerpc64 __ */