From: David Daney <ddaney@caviumnetworks.com>
To: Zhang Le <r0bertz@gentoo.org>, Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org, manuel.lauss@gmail.com
Subject: Re: [PATCH v2] -git compile fixes for MIPS
Date: Wed, 17 Jun 2009 12:33:37 -0700 [thread overview]
Message-ID: <4A394511.6000705@caviumnetworks.com> (raw)
In-Reply-To: <1245266590-31999-1-git-send-email-r0bertz@gentoo.org>
Zhang Le wrote:
> Quick fixes for some compile failures which have cropped up
> in linus-git in the last 24 hours:
>
> CC arch/mips/kernel/time.o
> In file included from linux-2.6.git/include/linux/bug.h:4,
> from linux-2.6.git/arch/mips/kernel/time.c:13:
> linux-2.6.git/arch/mips/include/asm/bug.h:10: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'BUG'
> linux-2.6.git/arch/mips/include/asm/bug.h: In function '__BUG_ON':
> linux-2.6.git/arch/mips/include/asm/bug.h:26: error: implicit declaration of function 'BUG'
>
> CC arch/mips/kernel/traps.o
> cc1: warnings being treated as errors
> /home/zhangle/linux/arch/mips/kernel/traps.c: In function ‘set_uncached_handler’:
> /home/zhangle/linux/arch/mips/kernel/traps.c:1604: error: format not a string literal and no format arguments
>
> CC arch/mips/mm/uasm.o
> In file included from linux-2.6.git/arch/mips/mm/uasm.c:21:
> linux-2.6.git/arch/mips/include/asm/bugs.h: In function 'check_bugs':
> linux-2.6.git/arch/mips/include/asm/bugs.h:34: error: implicit declaration of function 'smp_processor_id'
> linux-2.6.git/arch/mips/mm/uasm.c: In function 'uasm_copy_handler':
> linux-2.6.git/arch/mips/mm/uasm.c:514: error: implicit declaration of function 'memcpy'
>
> Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
> Signed-off-by: Zhang Le <r0bertz@gentoo.org>
This one looks better. However...
> ---
> arch/mips/include/asm/bug.h | 1 +
> arch/mips/include/asm/bugs.h | 1 +
> arch/mips/kernel/traps.c | 2 +-
> arch/mips/mm/uasm.c | 1 +
> 4 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/arch/mips/include/asm/bug.h b/arch/mips/include/asm/bug.h
> index 08ea468..974b161 100644
> --- a/arch/mips/include/asm/bug.h
> +++ b/arch/mips/include/asm/bug.h
> @@ -6,6 +6,7 @@
> #ifdef CONFIG_BUG
>
> #include <asm/break.h>
> +#include <linux/compiler.h>
... usually you put linux/ before asm/
You could add: Reviewed-by: David Daney <ddaney@caviumnetworks.com>
with that change.
>
> static inline void __noreturn BUG(void)
> {
> diff --git a/arch/mips/include/asm/bugs.h b/arch/mips/include/asm/bugs.h
> index 9dc10df..b160a70 100644
> --- a/arch/mips/include/asm/bugs.h
> +++ b/arch/mips/include/asm/bugs.h
> @@ -11,6 +11,7 @@
>
> #include <linux/bug.h>
> #include <linux/delay.h>
> +#include <linux/smp.h>
>
> #include <asm/cpu.h>
> #include <asm/cpu-info.h>
> diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
> index 08f1edf..0e9922b 100644
> --- a/arch/mips/kernel/traps.c
> +++ b/arch/mips/kernel/traps.c
> @@ -1601,7 +1601,7 @@ void __cpuinit set_uncached_handler(unsigned long offset, void *addr,
> #endif
>
> if (!addr)
> - panic(panic_null_cerr);
> + panic("%s", panic_null_cerr);
>
> memcpy((void *)(uncached_ebase + offset), addr, size);
> }
> diff --git a/arch/mips/mm/uasm.c b/arch/mips/mm/uasm.c
> index f467199..ba538f7 100644
> --- a/arch/mips/mm/uasm.c
> +++ b/arch/mips/mm/uasm.c
> @@ -15,6 +15,7 @@
> #include <linux/kernel.h>
> #include <linux/types.h>
> #include <linux/init.h>
> +#include <linux/string.h>
>
> #include <asm/inst.h>
> #include <asm/elf.h>
prev parent reply other threads:[~2009-06-17 19:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-17 19:23 [PATCH v2] -git compile fixes for MIPS Zhang Le
2009-06-17 19:31 ` Manuel Lauss
2009-06-17 19:35 ` Zhang Le
2009-06-17 19:33 ` David Daney [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4A394511.6000705@caviumnetworks.com \
--to=ddaney@caviumnetworks.com \
--cc=linux-mips@linux-mips.org \
--cc=manuel.lauss@gmail.com \
--cc=r0bertz@gentoo.org \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.