| Message ID | 20120620152759.2caceb8c.yuasa@linux-mips.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On 20/06/12 08:27, Yoichi Yuasa wrote: > Commit: 3777808873b0c49c5cf27e44c948dfb02675d578 breaks all MIPS builds. > Hi Yoichi, I stumbled across the same build regression last night and came up with almost the same fix :-) Tested-by: John Crispin <blogic@openwrt.org> Thanks, John
Hello. On 20-06-2012 10:27, Yoichi Yuasa wrote: > Commit: 3777808873b0c49c5cf27e44c948dfb02675d578 Please also specify the summary of that commit in parens. > breaks all MIPS builds. [...] > Signed-off-by: Yoichi Yuasa<yuasa@linux-mips.org> WBR, Sergei
On Wed, Jun 20, 2012 at 03:27:59PM +0900, Yoichi Yuasa wrote:
> Commit: 3777808873b0c49c5cf27e44c948dfb02675d578 breaks all MIPS builds.
Thanks, fix applied.
Ralf
On 06/20/2012 09:12 AM, Ralf Baechle wrote: > On Wed, Jun 20, 2012 at 03:27:59PM +0900, Yoichi Yuasa wrote: > >> Commit: 3777808873b0c49c5cf27e44c948dfb02675d578 breaks all MIPS builds. > > Thanks, fix applied. > Where was it applied? It doesn't show up in linux-next for 20120622, which is where it is needed. David Daney
On Fri, Jun 22, 2012 at 7:54 PM, David Daney <ddaney@caviumnetworks.com> wrote: > On 06/20/2012 09:12 AM, Ralf Baechle wrote: >> >> On Wed, Jun 20, 2012 at 03:27:59PM +0900, Yoichi Yuasa wrote: >> >>> Commit: 3777808873b0c49c5cf27e44c948dfb02675d578 breaks all MIPS builds. >> >> >> Thanks, fix applied. >> > > Where was it applied? > > It doesn't show up in linux-next for 20120622, which is where it is needed. It's also desperately needed in mainline for 3.5. Ralf? Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Mon, Jul 16, 2012 at 9:27 PM, Geert Uytterhoeven <geert@linux-m68k.org> wrote: > On Fri, Jun 22, 2012 at 7:54 PM, David Daney <ddaney@caviumnetworks.com> wrote: >> On 06/20/2012 09:12 AM, Ralf Baechle wrote: >>> >>> On Wed, Jun 20, 2012 at 03:27:59PM +0900, Yoichi Yuasa wrote: >>> >>>> Commit: 3777808873b0c49c5cf27e44c948dfb02675d578 breaks all MIPS builds. >>> >>> >>> Thanks, fix applied. >>> >> >> Where was it applied? >> >> It doesn't show up in linux-next for 20120622, which is where it is needed. > > It's also desperately needed in mainline for 3.5. > > Ralf? Andrew? This prevents any green MIPS builds. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Wed, 18 Jul 2012 10:35:46 +0200 Geert Uytterhoeven <geert@linux-m68k.org> wrote: > On Mon, Jul 16, 2012 at 9:27 PM, Geert Uytterhoeven > <geert@linux-m68k.org> wrote: > > On Fri, Jun 22, 2012 at 7:54 PM, David Daney <ddaney@caviumnetworks.com> wrote: > >> On 06/20/2012 09:12 AM, Ralf Baechle wrote: > >>> > >>> On Wed, Jun 20, 2012 at 03:27:59PM +0900, Yoichi Yuasa wrote: > >>> > >>>> Commit: 3777808873b0c49c5cf27e44c948dfb02675d578 breaks all MIPS builds. > >>> > >>> > >>> Thanks, fix applied. > >>> > >> > >> Where was it applied? > >> > >> It doesn't show up in linux-next for 20120622, which is where it is needed. > > > > It's also desperately needed in mainline for 3.5. > > > > Ralf? > > Andrew? This prevents any green MIPS builds. > The patch is already in linux-next via Ralf's tree. Perhaps he nodded off - I'll send it at Linus right now.
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>
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(-)