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