diff options
| author | Scott Wood <scottwood@freescale.com> | 2015-10-07 05:48:07 +0200 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2015-10-17 07:36:36 +0200 |
| commit | 1112450a18dfcc26dd18000e20bf06bda27f2bad (patch) | |
| tree | 9cd8f0576c8b6ad195c184f50ca0ef4279844586 /arch/powerpc/platforms/85xx | |
| parent | powerpc/fsl-corenet: Disable coreint if kexec is enabled (diff) | |
| download | linux-1112450a18dfcc26dd18000e20bf06bda27f2bad.tar.xz linux-1112450a18dfcc26dd18000e20bf06bda27f2bad.zip | |
powerpc/85xx: Don't use generic timebase sync on 64-bit
85xx currently uses the generic timebase sync mechanism when
CONFIG_KEXEC is enabled, because 32-bit 85xx kexec support does a hard
reset of each core. 64-bit 85xx kexec does not do this, so we neither
need nor want this (nor is the generic timebase sync code built on
ppc64).
FWIW, I don't like the fact that the hard reset is done on 32-bit
kexec, and I especially don't like the timebase sync being triggered
only on the presence of CONFIG_KEXEC rather than actually booting in
that environment, but that's beyond the scope of this patch...
Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'arch/powerpc/platforms/85xx')
| -rw-r--r-- | arch/powerpc/platforms/85xx/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c index c2ded034ef53..a0763be7259e 100644 --- a/arch/powerpc/platforms/85xx/smp.c +++ b/arch/powerpc/platforms/85xx/smp.c @@ -344,7 +344,7 @@ struct smp_ops_t smp_85xx_ops = { .cpu_disable = generic_cpu_disable, .cpu_die = generic_cpu_die, #endif -#ifdef CONFIG_KEXEC +#if defined(CONFIG_KEXEC) && !defined(CONFIG_PPC64) .give_timebase = smp_generic_give_timebase, .take_timebase = smp_generic_take_timebase, #endif |