* [PATCH] -git compile fixes for MIPS
@ 2009-06-17 7:55 Manuel Lauss
2009-06-17 13:35 ` Florian Fainelli
2009-06-17 15:39 ` David Daney
0 siblings, 2 replies; 4+ messages in thread
From: Manuel Lauss @ 2009-06-17 7:55 UTC (permalink / raw)
To: Linux-MIPS
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/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>
---
arch/mips/include/asm/bug.h | 2 +-
arch/mips/include/asm/bugs.h | 1 +
arch/mips/mm/uasm.c | 1 +
3 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/arch/mips/include/asm/bug.h b/arch/mips/include/asm/bug.h
index 08ea468..92b372a 100644
--- a/arch/mips/include/asm/bug.h
+++ b/arch/mips/include/asm/bug.h
@@ -7,7 +7,7 @@
#include <asm/break.h>
-static inline void __noreturn BUG(void)
+static inline void __attribute__((noreturn)) BUG(void)
{
__asm__ __volatile__("break %0" : : "i" (BRK_BUG));
/* Fool GCC into thinking the function doesn't return. */
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/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>
--
1.6.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] -git compile fixes for MIPS
2009-06-17 7:55 [PATCH] -git compile fixes for MIPS Manuel Lauss
@ 2009-06-17 13:35 ` Florian Fainelli
2009-06-17 15:39 ` David Daney
1 sibling, 0 replies; 4+ messages in thread
From: Florian Fainelli @ 2009-06-17 13:35 UTC (permalink / raw)
To: Manuel Lauss; +Cc: Linux-MIPS
Hi Manuel,
Le Wednesday 17 June 2009 09:55:31 Manuel Lauss, vous avez écrit :
> 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/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>
Thanks for fixing this !
Tested-by: Florian Fainelli <florian@openwrt.org>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] -git compile fixes for MIPS
2009-06-17 7:55 [PATCH] -git compile fixes for MIPS Manuel Lauss
2009-06-17 13:35 ` Florian Fainelli
@ 2009-06-17 15:39 ` David Daney
2009-06-17 19:27 ` Manuel Lauss
1 sibling, 1 reply; 4+ messages in thread
From: David Daney @ 2009-06-17 15:39 UTC (permalink / raw)
To: Manuel Lauss, Ralf Baechle; +Cc: Linux-MIPS
Manuel Lauss 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/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>
> ---
> arch/mips/include/asm/bug.h | 2 +-
> arch/mips/include/asm/bugs.h | 1 +
> arch/mips/mm/uasm.c | 1 +
> 3 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/arch/mips/include/asm/bug.h b/arch/mips/include/asm/bug.h
> index 08ea468..92b372a 100644
> --- a/arch/mips/include/asm/bug.h
> +++ b/arch/mips/include/asm/bug.h
> @@ -7,7 +7,7 @@
>
> #include <asm/break.h>
>
> -static inline void __noreturn BUG(void)
> +static inline void __attribute__((noreturn)) BUG(void)
That isn't correct.
__noreturn is defined in linux/compiler.h You should figure out why
that definition is not being used.
David Daney
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] -git compile fixes for MIPS
2009-06-17 15:39 ` David Daney
@ 2009-06-17 19:27 ` Manuel Lauss
0 siblings, 0 replies; 4+ messages in thread
From: Manuel Lauss @ 2009-06-17 19:27 UTC (permalink / raw)
To: David Daney; +Cc: Ralf Baechle, Linux-MIPS
On Wed, Jun 17, 2009 at 5:39 PM, David Daney<ddaney@caviumnetworks.com> wrote:
> Manuel Lauss 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/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>
>> ---
>> arch/mips/include/asm/bug.h | 2 +-
>> arch/mips/include/asm/bugs.h | 1 +
>> arch/mips/mm/uasm.c | 1 +
>> 3 files changed, 3 insertions(+), 1 deletions(-)
>>
>> diff --git a/arch/mips/include/asm/bug.h b/arch/mips/include/asm/bug.h
>> index 08ea468..92b372a 100644
>> --- a/arch/mips/include/asm/bug.h
>> +++ b/arch/mips/include/asm/bug.h
>> @@ -7,7 +7,7 @@
>>
>> #include <asm/break.h>
>>
>> -static inline void __noreturn BUG(void)
>> +static inline void __attribute__((noreturn)) BUG(void)
>
> That isn't correct.
>
> __noreturn is defined in linux/compiler.h You should figure out why that
> definition is not being used.
I did a quick check, seems to be an include ordering problem; bug.h is included
before compiler.h... I don't know what exactly changed or whether the fact that
it worked previously was purely by accident. The "right" thing to do I think is
to include compiler.h in asm/bug.h.
Manuel Lauss
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-06-17 19:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-17 7:55 [PATCH] -git compile fixes for MIPS Manuel Lauss
2009-06-17 13:35 ` Florian Fainelli
2009-06-17 15:39 ` David Daney
2009-06-17 19:27 ` Manuel Lauss
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.