Blackfin arch bug fixing for merge window
Hi Linus,
Please pull from 'for-linus' branch of
master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git for-linus
to receive the following updates:
arch/blackfin/Makefile | 4 ++-- arch/blackfin/kernel/setup.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
Bryan Wu (1):
Blackfin arch: use KBUILD_CFLAGS and KBUILD_AFLAGS in Makefile
Mike Frysinger (1):
Blackfin arch: Javier Herrer writes: fix building when icache and
dcache is disabled
arch/blackfin/Makefile +2 -2
@@ -12,8 +12,8 @@ LDFLAGS_vmlinux := -X 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=_
arch/blackfin/kernel/setup.c +2 -2
@@ -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 definedCONFIG_BFIN_WT "wt"#endif - , 0); + "", 0);seq_printf (m,"%s\n" , cache);