Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d435365 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0fd56c70 38f668e8

arch/blackfin/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);