diff options
| -rw-r--r-- | arch/blackfin/Makefile | 4 | ||||
| -rw-r--r-- | arch/blackfin/kernel/setup.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile index 3c87291bcda..f7cac7c51e7 100644 --- a/arch/blackfin/Makefile +++ b/arch/blackfin/Makefile @@ -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=_ diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c index 0e746449c29..f1b059e5a06 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); |