hc
2023-12-08 01573e231f18eb2d99162747186f59511f56b64d
kernel/arch/sh/include/asm/processor.h
....@@ -39,9 +39,6 @@
3939 /* SH4AL-DSP types */
4040 CPU_SH7343, CPU_SH7722, CPU_SH7366, CPU_SH7372,
4141
42
- /* SH-5 types */
43
- CPU_SH5_101, CPU_SH5_103,
44
-
4542 /* Unknown subtype */
4643 CPU_SH_NONE
4744 };
....@@ -53,7 +50,6 @@
5350 CPU_FAMILY_SH4,
5451 CPU_FAMILY_SH4A,
5552 CPU_FAMILY_SH4AL_DSP,
56
- CPU_FAMILY_SH5,
5753 CPU_FAMILY_UNKNOWN,
5854 };
5955
....@@ -167,18 +163,12 @@
167163 */
168164 #ifdef CONFIG_CPU_SH2A
169165 extern unsigned int instruction_size(unsigned int insn);
170
-#elif defined(CONFIG_SUPERH32)
171
-#define instruction_size(insn) (2)
172166 #else
173
-#define instruction_size(insn) (4)
167
+#define instruction_size(insn) (2)
174168 #endif
175169
176170 #endif /* __ASSEMBLY__ */
177171
178
-#ifdef CONFIG_SUPERH32
179
-# include <asm/processor_32.h>
180
-#else
181
-# include <asm/processor_64.h>
182
-#endif
172
+#include <asm/processor_32.h>
183173
184174 #endif /* __ASM_SH_PROCESSOR_H */