Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
Blackfin arch: use KBUILD_CFLAGS and KBUILD_AFLAGS in Makefile
Blackfin arch: Javier Herrer writes: fix building when icache and dcache is disabled
diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile
index 3c87291..f7cac7c 100644
--- a/arch/blackfin/Makefile
+++ b/arch/blackfin/Makefile
@@ -12,8 +12,8 @@
OBJCOPYFLAGS := -O binary -R .note -R .comment -S
GZFLAGS := -9
-CFLAGS += $(call cc-option,-mno-fdpic)
-AFLAGS += $(call cc-option,-mno-fdpic)
+KBUILD_CFLAGS += $(call cc-option,-mno-fdpic)
+KBUILD_AFLAGS += $(call cc-option,-mno-fdpic)
CFLAGS_MODULE += -mlong-calls
KALLSYMS += --symbol-prefix=_
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 @@
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 @@
#elif defined CONFIG_BFIN_WT
"wt"
#endif
- , 0);
+ "", 0);
seq_printf(m, "%s\n", cache);