diff --git a/arch/sh/kernel/cpu/sh5/Makefile b/arch/sh/kernel/cpu/sh5/Makefile
index 9778f9bdff3a..7ea10732b5cc 100644
--- a/arch/sh/kernel/cpu/sh5/Makefile
+++ b/arch/sh/kernel/cpu/sh5/Makefile
@@ -1 +1,3 @@
-obj-y := entry.o
+obj-y := entry.o switchto.o
+
+obj-$(CONFIG_KALLSYMS)		+= unwind.o
diff --git a/arch/sh64/kernel/switchto.S b/arch/sh/kernel/cpu/sh5/switchto.S
similarity index 100%
rename from arch/sh64/kernel/switchto.S
rename to arch/sh/kernel/cpu/sh5/switchto.S
diff --git a/arch/sh64/kernel/unwind.c b/arch/sh/kernel/cpu/sh5/unwind.c
similarity index 100%
rename from arch/sh64/kernel/unwind.c
rename to arch/sh/kernel/cpu/sh5/unwind.c