diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-22 19:29:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-22 19:29:05 -0700 |
| commit | 6d435365dd49ac5f7fe6f0e757e942875b1d1550 (patch) | |
| tree | eed7fb9d500792c50d27e40a660a274d3124e642 | |
| parent | 0fd56c70334d7899edaee742ae49d9b893951376 (diff) | |
| parent | 38f668e8f78c6699c705f7a1f4866ed03a93e4cf (diff) | |
| download | blackbird-op-linux-6d435365dd49ac5f7fe6f0e757e942875b1d1550.tar.gz blackbird-op-linux-6d435365dd49ac5f7fe6f0e757e942875b1d1550.zip | |
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
| -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 3c87291bcdab..f7cac7c51e7e 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 0e746449c29b..f1b059e5a06c 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); |
