From 7124dbd9278375fe233ef74442dfdb21a0b89fa2 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] --- yaml --- r: 77730 b: refs/heads/master c:
 343ac72248d360f1fae72176aca1117be19189ec h: refs/heads/master v: v3

---
 [refs]                                          |  2 +-
 trunk/arch/sh/kernel/cpu/Makefile               |  6 ++++++
 trunk/arch/sh/kernel/cpu/sh5/Makefile           |  1 +
 .../{sh64/kernel => sh/kernel/cpu/sh5}/entry.S  |  4 +---
 trunk/include/asm-sh/processor.h                | 17 ++++++++++++-----
 5 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100644 trunk/arch/sh/kernel/cpu/sh5/Makefile
 rename trunk/arch/{sh64/kernel => sh/kernel/cpu/sh5}/entry.S (99%)

diff --git a/[refs] b/[refs]
index 0916d3e883a1..7724d100dd55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49e6c3e7460a718242dc11b801811f0ac6892154
+refs/heads/master: 343ac72248d360f1fae72176aca1117be19189ec
diff --git a/trunk/arch/sh/kernel/cpu/Makefile b/trunk/arch/sh/kernel/cpu/Makefile
index d055a3ea6b4b..f471d242774e 100644
--- a/trunk/arch/sh/kernel/cpu/Makefile
+++ b/trunk/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/trunk/arch/sh/kernel/cpu/sh5/Makefile b/trunk/arch/sh/kernel/cpu/sh5/Makefile
new file mode 100644
index 000000000000..9778f9bdff3a
--- /dev/null
+++ b/trunk/arch/sh/kernel/cpu/sh5/Makefile
@@ -0,0 +1 @@
+obj-y := entry.o
diff --git a/trunk/arch/sh64/kernel/entry.S b/trunk/arch/sh/kernel/cpu/sh5/entry.S
similarity index 99%
rename from trunk/arch/sh64/kernel/entry.S
rename to trunk/arch/sh/kernel/cpu/sh5/entry.S
index 7013fcb6665c..2f505a7cb5f9 100644
--- a/trunk/arch/sh64/kernel/entry.S
+++ b/trunk/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/trunk/include/asm-sh/processor.h b/trunk/include/asm-sh/processor.h
index 76c4dc7021cb..f3bd82e95898 100644
--- a/trunk/include/asm-sh/processor.h
+++ b/trunk/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 */