diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-04 15:09:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-04 15:09:44 -0700 |
| commit | 6fdf5e67fe8d3c83500dad9acae985132c2459a3 (patch) | |
| tree | c6cb9c0b22c4d22e4c65a40c0851aff5eedf7cd5 | |
| parent | abd24df828f1a72971db29d1b74fefae104ea9e2 (diff) | |
| parent | e64a3cfcd929d093a2f076bcace9afa7ba5a2e32 (diff) | |
| download | linux-6fdf5e67fe8d3c83500dad9acae985132c2459a3.tar.gz linux-6fdf5e67fe8d3c83500dad9acae985132c2459a3.tar.bz2 linux-6fdf5e67fe8d3c83500dad9acae985132c2459a3.zip | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/upstream-linus
* '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
| -rw-r--r-- | arch/mips/kernel/gdb-stub.c | 3 | ||||
| -rw-r--r-- | include/asm-mips/mach-pb1x00/pb1200.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/kernel/gdb-stub.c b/arch/mips/kernel/gdb-stub.c index 3191afa29ad8..25f4eab8ea9c 100644 --- a/arch/mips/kernel/gdb-stub.c +++ b/arch/mips/kernel/gdb-stub.c @@ -139,7 +139,6 @@ #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 diff --git a/include/asm-mips/mach-pb1x00/pb1200.h b/include/asm-mips/mach-pb1x00/pb1200.h index ed5fd7390678..72213e3d02c7 100644 --- a/include/asm-mips/mach-pb1x00/pb1200.h +++ b/include/asm-mips/mach-pb1x00/pb1200.h @@ -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 */ |