]> err.no Git - linux-2.6/commitdiff
Blackfin arch: Javier Herrer writes: fix building when icache and dcache is disabled
authorMike Frysinger <michael.frysinger@analog.com>
Mon, 22 Oct 2007 02:55:35 +0000 (10:55 +0800)
committerBryan Wu <bryan.wu@analog.com>
Mon, 22 Oct 2007 02:55:35 +0000 (10:55 +0800)
Signed-off-by: Mike Frysinger <michael.frysinger@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
arch/blackfin/kernel/setup.c

index 0e746449c29b1f2e75cbe232d73cfc28566e46f4..f1b059e5a06cb171516804f441438011b26eaf11 100644 (file)
@@ -501,7 +501,7 @@ EXPORT_SYMBOL(sclk_to_usecs);
 
 unsigned long usecs_to_sclk(unsigned long usecs)
 {
-       return get_sclk() / (USEC_PER_SEC * (u64)usecs);
+       return (get_sclk() * (u64)usecs) / USEC_PER_SEC;
 }
 EXPORT_SYMBOL(usecs_to_sclk);
 
@@ -589,7 +589,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 #elif defined CONFIG_BFIN_WT
                "wt"
 #endif
-               , 0);
+               "", 0);
 
        seq_printf(m, "%s\n", cache);