linux-mips
[Top] [All Lists]

[PATCH] -git compile fixes for MIPS

To: Linux-MIPS <linux-mips@linux-mips.org>
Subject: [PATCH] -git compile fixes for MIPS
From: Manuel Lauss <manuel.lauss@googlemail.com>
Date: Wed, 17 Jun 2009 09:55:31 +0200
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :organization:user-agent:mime-version:to:subject:content-type :content-transfer-encoding; bh=6D6jCo1d3ZbYyQu9Blbp1aJLUx49y4ZDsoIeWavyKYI=; b=EebR31DvALuajXhUrbPe7r3cg0vP89lM7Nb1APN4Hu3hqeTe/GOl7y/tZpFWxyVcP6 iMQd7Okur71lrbHRa9iKtsiirKNLB7aXPbGykH4oDeRwACAYW92YGF6b50Sa7QMw7UvG t4SDNXs12PHR1pwd86pQh939oLHm9+si4Vlw8=
Domainkey-signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=message-id:date:from:organization:user-agent:mime-version:to :subject:content-type:content-transfer-encoding; b=vUIBuONLhF72kr52pg27W413j/9uo3On+yj8fC+zOYYeLg1udOs0Q35sgQDEffvlx6 T6FaPkbs1rIRuQoQnIC3ksMT5K5yR+LDubdsKCYotSS+2L9TrxRhAqq34wQtwFVIGaY6 N+9Pfvvu7bCB8+shX5Qne30+nNgDrChVf61Io=
Organization: Private
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
User-agent: Thunderbird 2.0.0.21 (X11/20090320)

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


<Prev in Thread] Current Thread [Next in Thread>