AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-04-06 23:17:58 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[POWERPC] Wrap cpu_die() with CONFIG_HOTPLUG_CPU

Browse Source 
Per email discussion, it appears that rtas_stop_self()
and pSeries_mach_cpu_die() should not be compiled if
CONFIG_HOTPLUG_CPU is not defined. This patch adds
#ifdefs around these bits of code.

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Linas Vepstas 2006-11-16 15:41:15 -06:00 committed by Paul Mackerras
parent 5873c9bdb0
commit 088df4d256
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/kernel/rtas.c
View File

@ -810,9 +810,9 @@ asmlinkage int ppc_rtas(struct rtas_args __user *uargs)
return 0; return 0;
} }
#ifdef CONFIG_HOTPLUG_CPU
/* This version can't take the spinlock, because it never returns */ /* This version can't take the spinlock, because it never returns */
static struct rtas_args rtas_stop_self_args = {
struct rtas_args rtas_stop_self_args = {
/* The token is initialized for real in setup_system() */ /* The token is initialized for real in setup_system() */
.token = RTAS_UNKNOWN_SERVICE, .token = RTAS_UNKNOWN_SERVICE,
.nargs = 0, .nargs = 0,
@ -834,6 +834,7 @@ void rtas_stop_self(void)
panic("Alas, I survived.\n"); panic("Alas, I survived.\n");
} }
#endif
/* /*
* Call early during boot, before mem init or bootmem, to retrieve the RTAS * Call early during boot, before mem init or bootmem, to retrieve the RTAS

4
arch/powerpc/platforms/pseries/setup.c
View File

@ -347,6 +347,7 @@ static int __init pSeries_init_panel(void)
} }
arch_initcall(pSeries_init_panel); arch_initcall(pSeries_init_panel);
#ifdef CONFIG_HOTPLUG_CPU
static void pSeries_mach_cpu_die(void) static void pSeries_mach_cpu_die(void)
{ {
local_irq_disable(); local_irq_disable();
@ -357,6 +358,9 @@ static void pSeries_mach_cpu_die(void)
BUG(); BUG();
for(;;); for(;;);
} }
#else
#define pSeries_mach_cpu_die NULL
#endif
static int pseries_set_dabr(unsigned long dabr) static int pseries_set_dabr(unsigned long dabr)
{ {

2
include/asm-powerpc/rtas.h
View File

@ -54,8 +54,6 @@ struct rtas_args {
rtas_arg_t *rets; /* Pointer to return values in args[]. */ rtas_arg_t *rets; /* Pointer to return values in args[]. */
}; };
extern struct rtas_args rtas_stop_self_args;
struct rtas_t { struct rtas_t {
unsigned long entry; /* physical address pointer */ unsigned long entry; /* physical address pointer */
unsigned long base; /* physical address pointer */ unsigned long base; /* physical address pointer */