Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/upstrea...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Apr 2008 22:09:44 +0000 (15:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Apr 2008 22:09:44 +0000 (15:09 -0700)
* 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/upstream-linus:
  [MIPS] Make KGDB compile on UP
  [MIPS] Pb1200: Fix header breakage

arch/mips/kernel/gdb-stub.c
include/asm-mips/mach-pb1x00/pb1200.h

index 3191afa29ad8061404f1ba11b4aefd045acae5fa..25f4eab8ea9cad18dc2339969d482d83e4c1e1f0 100644 (file)
 #include <asm/system.h>
 #include <asm/gdb-stub.h>
 #include <asm/inst.h>
-#include <asm/smp.h>
 
 /*
  * external low-level support routines
@@ -656,6 +655,7 @@ void set_async_breakpoint(unsigned long *epc)
        *epc = (unsigned long)async_breakpoint;
 }
 
+#ifdef CONFIG_SMP
 static void kgdb_wait(void *arg)
 {
        unsigned flags;
@@ -668,6 +668,7 @@ static void kgdb_wait(void *arg)
 
        local_irq_restore(flags);
 }
+#endif
 
 /*
  * GDB stub needs to call kgdb_wait on all processor with interrupts
index ed5fd7390678d588c426c5414f07d61fb538230b..72213e3d02c76337c856c943bf32f57b0d244a33 100644 (file)
@@ -245,7 +245,7 @@ enum external_pb1200_ints {
        PB1200_SD1_INSERT_INT,
        PB1200_SD1_EJECT_INT,
 
-       PB1200_INT_END                  (PB1200_INT_BEGIN + 15)
+       PB1200_INT_END          = PB1200_INT_BEGIN + 15
 };
 
 /* For drivers/pcmcia/au1000_db1x00.c */