git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-sh
/
bugs.h
diff --git
a/include/asm-sh/bugs.h
b/include/asm-sh/bugs.h
index
154d774
..
a294997
100644
(file)
--- a/
include/asm-sh/bugs.h
+++ b/
include/asm-sh/bugs.h
@@
-16,21
+16,37
@@
static void __init check_bugs(void)
{
static void __init check_bugs(void)
{
- extern char *get_cpu_subtype(void);
extern unsigned long loops_per_jiffy;
extern unsigned long loops_per_jiffy;
- char *p
= &system_utsname.
machine[2]; /* "sh" */
+ char *p
= &init_utsname()->
machine[2]; /* "sh" */
cpu_data->loops_per_jiffy = loops_per_jiffy;
cpu_data->loops_per_jiffy = loops_per_jiffy;
-
+
switch (cpu_data->type) {
switch (cpu_data->type) {
- case CPU_SH7604:
+ case CPU_SH7604 ... CPU_SH7619:
+ *p++ = '2';
+ break;
+ case CPU_SH7206:
*p++ = '2';
*p++ = '2';
+ *p++ = 'a';
break;
case CPU_SH7705 ... CPU_SH7300:
*p++ = '3';
break;
break;
case CPU_SH7705 ... CPU_SH7300:
*p++ = '3';
break;
- case CPU_SH7750 ... CPU_ST40GX1:
+ case CPU_SH7750 ... CPU_SH4_501:
+ *p++ = '4';
+ break;
+ case CPU_SH7770 ... CPU_SH7785:
+ *p++ = '4';
+ *p++ = 'a';
+ break;
+ case CPU_SH73180 ... CPU_SH7722:
*p++ = '4';
*p++ = '4';
+ *p++ = 'a';
+ *p++ = 'l';
+ *p++ = '-';
+ *p++ = 'd';
+ *p++ = 's';
+ *p++ = 'p';
break;
default:
*p++ = '?';
break;
default:
*p++ = '?';