Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 106830
b: refs/heads/master
c: 3611ee7
h: refs/heads/master
v: v3
  • Loading branch information
Stuart Menefy authored and Paul Mundt committed Jul 28, 2008
1 parent fa2335f commit 0caa83a
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ef9247ef89be79ffbd9faaf722e05b7bed14fc1e
refs/heads/master: 3611ee7acc113e5e482b7d20d5133935226f3129
3 changes: 3 additions & 0 deletions trunk/arch/sh/kernel/cpu/sh4/probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ int __init detect_cpu_and_cache_system(void)
if ((cvr & 0x20000000) == 1)
boot_cpu_data.flags |= CPU_HAS_FPU;

/* We don't know the chip cut */
boot_cpu_data.cut_major = boot_cpu_data.cut_minor = -1;

/* Mask off the upper chip ID */
pvr &= 0xffff;

Expand Down
6 changes: 6 additions & 0 deletions trunk/arch/sh/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,12 @@ static int show_cpuinfo(struct seq_file *m, void *v)
seq_printf(m, "processor\t: %d\n", cpu);
seq_printf(m, "cpu family\t: %s\n", init_utsname()->machine);
seq_printf(m, "cpu type\t: %s\n", get_cpu_subtype(c));
if (c->cut_major == -1)
seq_printf(m, "cut\t\t: unknown\n");
else if (c->cut_minor == -1)
seq_printf(m, "cut\t\t: %d.x\n", c->cut_major);
else
seq_printf(m, "cut\t\t: %d.%d\n", c->cut_major, c->cut_minor);

show_cpuflags(m, c);

Expand Down
1 change: 1 addition & 0 deletions trunk/include/asm-sh/processor_32.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

struct sh_cpuinfo {
unsigned int type;
int cut_major, cut_minor;
unsigned long loops_per_jiffy;
unsigned long asid_cache;

Expand Down

0 comments on commit 0caa83a

Please sign in to comment.