diff options
author | Paul Mundt <lethal@linux-sh.org> | 2007-11-11 04:11:18 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-01-27 23:18:46 -0500 |
commit | 343ac72248d360f1fae72176aca1117be19189ec (patch) | |
tree | f9f100f3e16aea8986e5054a4da26d69ecd954ca /include/asm-sh/processor.h | |
parent | 49e6c3e7460a718242dc11b801811f0ac6892154 (diff) |
sh: Move over the SH-5 entry.S.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'include/asm-sh/processor.h')
-rw-r--r-- | include/asm-sh/processor.h | 17 |
1 files changed, 12 insertions, 5 deletions
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 @@ | |||
3 | 3 | ||
4 | #include <asm/cpu-features.h> | 4 | #include <asm/cpu-features.h> |
5 | 5 | ||
6 | #ifndef __ASSEMBLY__ | ||
7 | |||
6 | /* | 8 | /* |
7 | * CPU type and hardware bug flags. Kept separately for each CPU. | 9 | * CPU type and hardware bug flags. Kept separately for each CPU. |
8 | * | 10 | * |
@@ -40,11 +42,8 @@ enum cpu_type { | |||
40 | CPU_SH_NONE | 42 | CPU_SH_NONE |
41 | }; | 43 | }; |
42 | 44 | ||
43 | #ifdef CONFIG_SUPERH32 | 45 | /* Forward decl */ |
44 | # include "processor_32.h" | 46 | struct sh_cpuinfo; |
45 | #else | ||
46 | # include "processor_64.h" | ||
47 | #endif | ||
48 | 47 | ||
49 | /* arch/sh/kernel/setup.c */ | 48 | /* arch/sh/kernel/setup.c */ |
50 | const char *get_cpu_subtype(struct sh_cpuinfo *c); | 49 | const char *get_cpu_subtype(struct sh_cpuinfo *c); |
@@ -55,4 +54,12 @@ int vsyscall_init(void); | |||
55 | #define vsyscall_init() do { } while (0) | 54 | #define vsyscall_init() do { } while (0) |
56 | #endif | 55 | #endif |
57 | 56 | ||
57 | #endif /* __ASSEMBLY__ */ | ||
58 | |||
59 | #ifdef CONFIG_SUPERH32 | ||
60 | # include "processor_32.h" | ||
61 | #else | ||
62 | # include "processor_64.h" | ||
63 | #endif | ||
64 | |||
58 | #endif /* __ASM_SH_PROCESSOR_H */ | 65 | #endif /* __ASM_SH_PROCESSOR_H */ |