Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fdf5e67 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents abd24df8 e64a3cfc

arch/mips/kernel/gdb-stub.c

+2 −1
Original line number Diff line number Diff line
@@ -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

include/asm-mips/mach-pb1x00/pb1200.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */