openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2007-10-22 19:29:05 -07:00
parent 0fd56c7033 38f668e8f7
commit 6d435365dd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/blackfin/Makefile
View File

@ -12,8 +12,8 @@ LDFLAGS_vmlinux := -X
OBJCOPYFLAGS := -O binary -R .note -R .comment -S OBJCOPYFLAGS := -O binary -R .note -R .comment -S
GZFLAGS := -9 GZFLAGS := -9
CFLAGS += $(call cc-option,-mno-fdpic) KBUILD_CFLAGS += $(call cc-option,-mno-fdpic)
AFLAGS += $(call cc-option,-mno-fdpic) KBUILD_AFLAGS += $(call cc-option,-mno-fdpic)
CFLAGS_MODULE += -mlong-calls CFLAGS_MODULE += -mlong-calls
KALLSYMS += --symbol-prefix=_ KALLSYMS += --symbol-prefix=_

4
arch/blackfin/kernel/setup.c
View File

@ -501,7 +501,7 @@ EXPORT_SYMBOL(sclk_to_usecs);
unsigned long usecs_to_sclk(unsigned long 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); EXPORT_SYMBOL(usecs_to_sclk);
@ -589,7 +589,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
#elif defined CONFIG_BFIN_WT #elif defined CONFIG_BFIN_WT
"wt" "wt"
#endif #endif
, 0); "", 0);
seq_printf(m, "%s\n", cache); seq_printf(m, "%s\n", cache);