openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2008-04-04 15:09:44 -07:00
parent abd24df828 e64a3cfcd9
commit 6fdf5e67fe
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/mips/kernel/gdb-stub.c
View File

@ -139,7 +139,6 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/gdb-stub.h> #include <asm/gdb-stub.h>
#include <asm/inst.h> #include <asm/inst.h>
#include <asm/smp.h>
/* /*
* external low-level support routines * external low-level support routines
@ -656,6 +655,7 @@ void set_async_breakpoint(unsigned long *epc)
*epc = (unsigned long)async_breakpoint; *epc = (unsigned long)async_breakpoint;
} }
#ifdef CONFIG_SMP
static void kgdb_wait(void *arg) static void kgdb_wait(void *arg)
{ {
unsigned flags; unsigned flags;
@ -668,6 +668,7 @@ static void kgdb_wait(void *arg)
local_irq_restore(flags); local_irq_restore(flags);
} }
#endif
/* /*
* GDB stub needs to call kgdb_wait on all processor with interrupts * GDB stub needs to call kgdb_wait on all processor with interrupts

2
include/asm-mips/mach-pb1x00/pb1200.h
View File

@ -245,7 +245,7 @@ enum external_pb1200_ints {
PB1200_SD1_INSERT_INT, PB1200_SD1_INSERT_INT,
PB1200_SD1_EJECT_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 */ /* For drivers/pcmcia/au1000_db1x00.c */