lkml.org 
[lkml]   [2012]   [Jun]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] MIPS: fix bug.h MIPS build regression
    Commit: 3777808873b0c49c5cf27e44c948dfb02675d578 breaks all MIPS builds.

    CC arch/mips/kernel/machine_kexec.o
    In file included from include/linux/kernel.h:20:0,
    from include/asm-generic/bug.h:35,
    from /home/yuasa/src/linux/kernel/git/linux-2.6/arch/mips/include/asm/bug.h:41,
    from /home/yuasa/src/linux/kernel/git/linux-2.6/arch/mips/include/asm/bitops.h:20,
    from include/linux/bitops.h:22,
    from include/linux/signal.h:38,
    from include/linux/elfcore.h:5,
    from include/linux/kexec.h:60,
    from arch/mips/kernel/machine_kexec.c:9:
    include/linux/log2.h: In function '__ilog2_u32':
    include/linux/log2.h:34:2: error: implicit declaration of function 'fls' [-Werror=implicit-function-declaration]
    include/linux/log2.h: In function '__ilog2_u64':
    include/linux/log2.h:42:2: error: implicit declaration of function 'fls64' [-Werror=implicit-function-declaration]
    include/linux/log2.h: In function '__roundup_pow_of_two':
    include/linux/log2.h:63:2: error: implicit declaration of function 'fls_long' [-Werror=implicit-function-declaration]
    In file included from include/linux/bitops.h:22:0,
    from include/linux/signal.h:38,
    from include/linux/elfcore.h:5,
    from include/linux/kexec.h:60,
    from arch/mips/kernel/machine_kexec.c:9:
    /home/yuasa/src/linux/kernel/git/linux-2.6/arch/mips/include/asm/bitops.h: At top level:
    /home/yuasa/src/linux/kernel/git/linux-2.6/arch/mips/include/asm/bitops.h:615:19: error: static declaration of 'fls' follows non-static declaration
    include/linux/log2.h:34:9: note: previous implicit declaration of 'fls' was here
    In file included from /home/yuasa/src/linux/kernel/git/linux-2.6/arch/mips/include/asm/bitops.h:651:0,
    from include/linux/bitops.h:22,
    from include/linux/signal.h:38,
    from include/linux/elfcore.h:5,
    from include/linux/kexec.h:60,
    from arch/mips/kernel/machine_kexec.c:9:
    include/asm-generic/bitops/fls64.h:18:28: error: static declaration of 'fls64' follows non-static declaration
    include/linux/log2.h:42:9: note: previous implicit declaration of 'fls64' was here
    In file included from include/linux/signal.h:38:0,
    from include/linux/elfcore.h:5,
    from include/linux/kexec.h:60,
    from arch/mips/kernel/machine_kexec.c:9:
    include/linux/bitops.h:160:24: error: conflicting types for 'fls_long'
    include/linux/log2.h:63:16: note: previous implicit declaration of 'fls_long' was here
    cc1: all warnings being treated as errors

    make[2]: *** [arch/mips/kernel/machine_kexec.o] Error 1

    Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
    ---
    arch/mips/include/asm/bitops.h | 1 -
    arch/mips/include/asm/io.h | 1 +
    2 files changed, 1 insertions(+), 1 deletions(-)

    diff --git a/arch/mips/include/asm/bitops.h b/arch/mips/include/asm/bitops.h
    index 2e1ad4c..82ad35c 100644
    --- a/arch/mips/include/asm/bitops.h
    +++ b/arch/mips/include/asm/bitops.h
    @@ -17,7 +17,6 @@
    #include <linux/irqflags.h>
    #include <linux/types.h>
    #include <asm/barrier.h>
    -#include <asm/bug.h>
    #include <asm/byteorder.h> /* sigh ... */
    #include <asm/cpu-features.h>
    #include <asm/sgidefs.h>
    diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h
    index 37a8379..100f9a3 100644
    --- a/arch/mips/include/asm/io.h
    +++ b/arch/mips/include/asm/io.h
    @@ -17,6 +17,7 @@
    #include <linux/types.h>

    #include <asm/addrspace.h>
    +#include <asm/bug.h>
    #include <asm/byteorder.h>
    #include <asm/cpu.h>
    #include <asm/cpu-features.h>
    --
    1.7.0.4


    \
     
     \ /
      Last update: 2012-06-20 09:21    [W:0.036 / U:0.096 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site