summaryrefslogtreecommitdiffstats
path: root/arch/blackfin
diff options
context:
space:
mode:
authorMike Frysinger <michael.frysinger@analog.com>2007-10-22 10:55:35 +0800
committerBryan Wu <bryan.wu@analog.com>2007-10-22 10:55:35 +0800
commitda27abb79970e80904818e3866703ed02953a174 (patch)
tree63cfb7af6b4fcf5edb042f8c0b75b8eb4126822f /arch/blackfin
parent55b70a0300b873c0ec7ea6e33752af56f41250ce (diff)
downloadop-kernel-dev-da27abb79970e80904818e3866703ed02953a174.zip
op-kernel-dev-da27abb79970e80904818e3866703ed02953a174.tar.gz
Blackfin arch: Javier Herrer writes: fix building when icache and dcache is disabled
Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Diffstat (limited to 'arch/blackfin')
-rw-r--r--arch/blackfin/kernel/setup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index 0e74644..f1b059e 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -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);
OpenPOWER on IntegriCloud