Merge Blackfin-uClinux tree with latest Linus GIT tree including "LOG2.H" patch failed

Merge Blackfin-uClinux tree with latest Linus GIT tree including "LOG2.H" patch failed

[Bryan Wu]

Dear David and Forks:

I am a developer of Blackfin uClinux (blackfin.uclinux.org). After git clone
the latest Linus GIT tree and quilt the blackfin-uclinux patch list, I met
some problems related with your log2.h patches when I try to compile the
kernel. The compile log is listed as below:

======================================================
$ make
scripts/kconfig/conf -s arch/blackfin/Kconfig
  CHK     include/linux/version.h
  CHK     include/linux/utsrelease.h
  CC      arch/blackfin/kernel/asm-offsets.s
In file included from include/asm-generic/page.h:7,
                 from include/asm/page.h:84,
                 from include/asm/user.h:10,
                 from include/asm/bfin-global.h:38,
                 from include/asm/blackfin.h:12,
                 from include/asm/system.h:240,
                 from include/asm/bitops.h:10,
                 from include/linux/bitops.h:9,
                 from include/linux/thread_info.h:20,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:49,
                 from include/linux/capability.h:45,
                 from include/linux/sched.h:46,
                 from arch/blackfin/kernel/asm-offsets.c:33:
include/linux/log2.h: In function '__ilog2_u32':
include/linux/log2.h:34: warning: implicit declaration of function 'fls'
include/linux/log2.h: In function '__ilog2_u64':
include/linux/log2.h:42: warning: implicit declaration of function 'fls64'
include/linux/log2.h: In function '__roundup_pow_of_two':
include/linux/log2.h:52: warning: implicit declaration of function
'fls_long'
In file included from include/asm/bitops.h:210,
                 from include/linux/bitops.h:9,
                 from include/linux/thread_info.h:20,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:49,
                 from include/linux/capability.h:45,
                 from include/linux/sched.h:46,
                 from arch/blackfin/kernel/asm-offsets.c:33:
include/asm-generic/bitops/fls.h: At top level:
include/asm-generic/bitops/fls.h:13: error: static declaration of 'fls'
follows non-static declaration
include/linux/log2.h:34: error: previous implicit declaration of 'fls' was
here
In file included from include/asm/bitops.h:211,
                 from include/linux/bitops.h:9,
                 from include/linux/thread_info.h:20,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:49,
                 from include/linux/capability.h:45,
                 from include/linux/sched.h:46,
                 from arch/blackfin/kernel/asm-offsets.c:33:
include/asm-generic/bitops/fls64.h:7: error: static declaration of 'fls64'
follows non-static declaration
include/linux/log2.h:42: error: previous implicit declaration of 'fls64' was
here
In file included from include/linux/thread_info.h:20,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:49,
                 from include/linux/capability.h:45,
                 from include/linux/sched.h:46,
                 from arch/blackfin/kernel/asm-offsets.c:33:
include/linux/bitops.h:57: error: conflicting types for 'fls_long'
include/linux/log2.h:52: error: previous implicit declaration of 'fls_long'
was here
make[1]: *** [arch/blackfin/kernel/asm-offsets.s] Error 1
make: *** [prepare0] Error 2
=============================================================

Could you please point me some hint with this?
Thanks a lot
Regards
-Bryan Wu