From 343ac72248d360f1fae72176aca1117be19189ec Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Sun, 11 Nov 2007 18:11:18 +0900
Subject: [PATCH] sh: Move over the SH-5 entry.S.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---
 arch/sh/kernel/cpu/Makefile                     |  6 ++++++
 arch/sh/kernel/cpu/sh5/Makefile                 |  1 +
 arch/{sh64/kernel => sh/kernel/cpu/sh5}/entry.S |  4 +---
 include/asm-sh/processor.h                      | 17 ++++++++++++-----
 4 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 arch/sh/kernel/cpu/sh5/Makefile
 rename arch/{sh64/kernel => sh/kernel/cpu/sh5}/entry.S (99%)

diff --git a/arch/sh/kernel/cpu/Makefile b/arch/sh/kernel/cpu/Makefile
index d055a3ea6b4b..f471d242774e 100644
--- a/arch/sh/kernel/cpu/Makefile
+++ b/arch/sh/kernel/cpu/Makefile
@@ -6,8 +6,14 @@ obj-$(CONFIG_CPU_SH2)		= sh2/
 obj-$(CONFIG_CPU_SH2A)		= sh2a/
 obj-$(CONFIG_CPU_SH3)		= sh3/
 obj-$(CONFIG_CPU_SH4)		= sh4/
+obj-$(CONFIG_CPU_SH5)		= sh5/
+
+# Special cases for family ancestry.
+
 obj-$(CONFIG_CPU_SH4A)		+= sh4a/
 
+# Common interfaces.
+
 obj-$(CONFIG_UBC_WAKEUP)	+= ubc.o
 obj-$(CONFIG_SH_ADC)		+= adc.o
 
diff --git a/arch/sh/kernel/cpu/sh5/Makefile b/arch/sh/kernel/cpu/sh5/Makefile
new file mode 100644
index 000000000000..9778f9bdff3a
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh5/Makefile
@@ -0,0 +1 @@
+obj-y := entry.o
diff --git a/arch/sh64/kernel/entry.S b/arch/sh/kernel/cpu/sh5/entry.S
similarity index 99%
rename from arch/sh64/kernel/entry.S
rename to arch/sh/kernel/cpu/sh5/entry.S
index 7013fcb6665c..2f505a7cb5f9 100644
--- a/arch/sh64/kernel/entry.S
+++ b/arch/sh/kernel/cpu/sh5/entry.S
@@ -10,12 +10,10 @@
  * Copyright (C) 2003, 2004 Richard Curnow
  *
  */
-
 #include <linux/errno.h>
 #include <linux/sys.h>
-
+#include <asm/cpu/registers.h>
 #include <asm/processor.h>
-#include <asm/registers.h>
 #include <asm/unistd.h>
 #include <asm/thread_info.h>
 #include <asm/asm-offsets.h>
diff --git a/include/asm-sh/processor.h b/include/asm-sh/processor.h
index 76c4dc7021cb..f3bd82e95898 100644
--- a/include/asm-sh/processor.h
+++ b/include/asm-sh/processor.h
@@ -3,6 +3,8 @@
 
 #include <asm/cpu-features.h>
 
+#ifndef __ASSEMBLY__
+
 /*
  *  CPU type and hardware bug flags. Kept separately for each CPU.
  *
@@ -40,11 +42,8 @@ enum cpu_type {
 	CPU_SH_NONE
 };
 
-#ifdef CONFIG_SUPERH32
-# include "processor_32.h"
-#else
-# include "processor_64.h"
-#endif
+/* Forward decl */
+struct sh_cpuinfo;
 
 /* arch/sh/kernel/setup.c */
 const char *get_cpu_subtype(struct sh_cpuinfo *c);
@@ -55,4 +54,12 @@ int vsyscall_init(void);
 #define vsyscall_init() do { } while (0)
 #endif
 
+#endif /* __ASSEMBLY__ */
+
+#ifdef CONFIG_SUPERH32
+# include "processor_32.h"
+#else
+# include "processor_64.h"
+#endif
+
 #endif /* __ASM_SH_PROCESSOR_H */
-- 
2.34.1