Skip to content

Commit

Permalink
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/g…
Browse files Browse the repository at this point in the history
…it/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
  • Loading branch information
Linus Torvalds committed Oct 23, 2007
2 parents 0fd56c7 + 38f668e commit 6d43536
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions arch/blackfin/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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=_

Expand Down
4 changes: 2 additions & 2 deletions arch/blackfin/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 6d43536

Please sign in to comment.