GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-28 09:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

powerpc/kexec: Fix regression causing compile failure on UP

Browse source 
Recent commit b987812b3f caused
a compile failure on UP because a considerably large block
of the file was included within CONFIG_SMP, hence making a stub
function not exposed on UP builds when it needed to be.

Relocate the stub to the #else /* ! CONFIG_SMP */ section
and also annotate the relevant else/endif so that nobody
else falls into the same trap I did.

Reported-by: Michael Guntsche <mike@it-loops.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Paul Gortmaker 2011-04-13 06:30:08 +00:00 • committed by Benjamin Herrenschmidt
parent 8f3dda75cb
commit 7c7a81b53e
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
arch/powerpc/kernel/crash.c
View file

@ -163,7 +163,7 @@ static void crash_kexec_prepare_cpus(int cpu)
} }
/* wait for all the CPUs to hit real mode but timeout if they don't come in */ /* wait for all the CPUs to hit real mode but timeout if they don't come in */
#if defined(CONFIG_PPC_STD_MMU_64) && defined(CONFIG_SMP) #ifdef CONFIG_PPC_STD_MMU_64
static void crash_kexec_wait_realmode(int cpu) static void crash_kexec_wait_realmode(int cpu)
{ {
unsigned int msecs; unsigned int msecs;
@ -188,9 +188,7 @@ static void crash_kexec_wait_realmode(int cpu)
} }
mb(); mb();
} }
#else #endif /* CONFIG_PPC_STD_MMU_64 */
static inline void crash_kexec_wait_realmode(int cpu) {}
#endif
/* /*
* This function will be called by secondary cpus or by kexec cpu * This function will be called by secondary cpus or by kexec cpu
@ -235,7 +233,9 @@ void crash_kexec_secondary(struct pt_regs *regs)
crash_ipi_callback(regs); crash_ipi_callback(regs);
} }
#else #else /* ! CONFIG_SMP */
static inline void crash_kexec_wait_realmode(int cpu) {}
static void crash_kexec_prepare_cpus(int cpu) static void crash_kexec_prepare_cpus(int cpu)
{ {
/* /*
@ -255,7 +255,7 @@ void crash_kexec_secondary(struct pt_regs *regs)
{ {
cpus_in_sr = CPU_MASK_NONE; cpus_in_sr = CPU_MASK_NONE;
} }
#endif #endif /* CONFIG_SMP */
/* /*
* Register a function to be called on shutdown. Only use this if you * Register a function to be called on shutdown. Only use this if you