Title: [5324] trunk/arch/blackfin/kernel/setup.c: correct icache size in show_cpuinfo(), let c_start() return proper pointer
- Revision
- 5324
- Author
- gyang
- Date
- 2008-09-22 03:22:46 -0500 (Mon, 22 Sep 2008)
Log Message
correct icache size in show_cpuinfo(), let c_start() return proper pointer
Modified Paths
Diff
Modified: trunk/arch/blackfin/kernel/setup.c (5323 => 5324)
--- trunk/arch/blackfin/kernel/setup.c 2008-09-20 17:48:17 UTC (rev 5323)
+++ trunk/arch/blackfin/kernel/setup.c 2008-09-22 08:22:46 UTC (rev 5324)
@@ -1000,7 +1000,7 @@
"cpu family\t: 0x%x\n"
"model name\t: ADSP-%s %lu(MHz CCLK) %lu(MHz SCLK) (%s)\n"
"stepping\t: %d\n",
- 0,
+ *(unsigned int *)v,
vendor,
(bfin_read_CHIPID() & CHIPID_FAMILY),
cpu, cclk/1000000, sclk/1000000,
@@ -1048,7 +1048,7 @@
if ((bfin_read_DMEM_CONTROL() & (ENDCPLB | DMC_ENABLE)) != (ENDCPLB | DMC_ENABLE))
dcache_size = 0;
- if ((bfin_read_IMEM_CONTROL() & (IMC | ENICPLB)) == (IMC | ENICPLB))
+ if ((bfin_read_IMEM_CONTROL() & (IMC | ENICPLB)) != (IMC | ENICPLB))
icache_size = 0;
seq_printf(m, "cache size\t: %d KB(L1 icache) "
@@ -1137,12 +1137,18 @@
static void *c_start(struct seq_file *m, loff_t *pos)
{
- return *pos < NR_CPUS ? ((void *)0x12345678) : NULL;
+ if (*pos == 0)
+ *pos = first_cpu(cpu_online_map);
+ if (*pos >= num_online_cpus())
+ return NULL;
+
+ return pos;
}
static void *c_next(struct seq_file *m, void *v, loff_t *pos)
{
- ++*pos;
+ *pos = next_cpu(*pos, cpu_online_map);
+
return c_start(m, pos);
}
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
