summaryrefslogtreecommitdiff
path: root/arch/sh
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2011-04-15 16:44:27 +0900
committerPaul Mundt <lethal@linux-sh.org>2011-04-18 19:04:50 +0900
commita375b15164dd9264f724ad941825e52c90145151 (patch)
tree41fc612c32daa34aec9fddac61513a5b14899143 /arch/sh
parent7ef0c12a280c059f4624d311bb1a7d946cbac7b7 (diff)
downloadlinux-3.10-a375b15164dd9264f724ad941825e52c90145151.tar.gz
linux-3.10-a375b15164dd9264f724ad941825e52c90145151.tar.bz2
linux-3.10-a375b15164dd9264f724ad941825e52c90145151.zip
sh: fixup fpu.o compile order
arch_ptrace() was modified to reference init_fpu() to fix up xstate initialization, which overlooked the fact that there are configurations that don't enable any of hard FPU support or emulation, resulting in build errors on DSP parts. Given that init_fpu() simply sets up the xstate slab cache and is side-stepped entirely for the DSP case, we can simply always build in the helper and fix up the references. Reported-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Cc: stable@kernel.org Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/kernel/cpu/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/sh/kernel/cpu/Makefile b/arch/sh/kernel/cpu/Makefile
index d49c2135fd4..ae95935d93c 100644
--- a/arch/sh/kernel/cpu/Makefile
+++ b/arch/sh/kernel/cpu/Makefile
@@ -17,7 +17,5 @@ obj-$(CONFIG_ARCH_SHMOBILE) += shmobile/
obj-$(CONFIG_SH_ADC) += adc.o
obj-$(CONFIG_SH_CLK_CPG_LEGACY) += clock-cpg.o
-obj-$(CONFIG_SH_FPU) += fpu.o
-obj-$(CONFIG_SH_FPU_EMU) += fpu.o
-obj-y += irq/ init.o clock.o hwblk.o proc.o
+obj-y += irq/ init.o clock.o fpu.o hwblk.o proc.o