Commit 90b9a32d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kdb-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb 

* 'kdb-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb: (25 commits)
  kdb,debug_core: Allow the debug core to receive a panic notification
  MAINTAINERS: update kgdb, kdb, and debug_core info
  debug_core,kdb: Allow the debug core to process a recursive debug entry
  printk,kdb: capture printk() when in kdb shell
  kgdboc,kdb: Allow kdb to work on a non open console port
  kgdb: Add the ability to schedule a breakpoint via a tasklet
  mips,kgdb: kdb low level trap catch and stack trace
  powerpc,kgdb: Introduce low level trap catching
  x86,kgdb: Add low level debug hook
  kgdb: remove post_primary_code references
  kgdb,docs: Update the kgdb docs to include kdb
  kgdboc,keyboard: Keyboard driver for kdb with kgdb
  kgdb: gdb "monitor" -> kdb passthrough
  sparc,sunzilog: Add console polling support for sunzilog serial driver
  sh,sh-sci: Use NO_POLL_CHAR in the SCIF polled console code
  kgdb,8250,pl011: Return immediately from console poll
  kgdb: core changes to support kdb
  kdb: core for kgdb back end (2 of 2)
  kdb: core for kgdb back end (1 of 2)
  kgdb,blackfin: Add in kgdb_arch_set_pc for blackfin
  ...
parents 8b108c60 4402c153

Documentation/DocBook/kgdb.tmpl

+516 −176

File changed.

Preview size limit exceeded, changes collapsed.

Documentation/kernel-parameters.txt

+10 −4
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ parameter is applicable: 
	ISAPNP	ISA PnP code is enabled.

	ISDN	Appropriate ISDN support is enabled.

	JOY	Appropriate joystick support is enabled.

	KGDB	Kernel debugger support is enabled.

	KVM	Kernel Virtual Machine support is enabled.

	LIBATA  Libata driver is enabled

	LP	Printer support is enabled.
@@ -1120,10 +1121,15 @@ and is between 256 and 4096 characters. It is defined in the file 
			use the HighMem zone if it exists, and the Normal

			zone if it does not.



	kgdboc=		[HW] kgdb over consoles.

			Requires a tty driver that supports console polling.

			(only serial supported for now)

			Format: <serial_device>[,baud]

	kgdboc=		[KGDB,HW] kgdb over consoles.

			Requires a tty driver that supports console polling,

			or a supported polling keyboard driver (non-usb).

			Serial only format: <serial_device>[,baud]

			keyboard only format: kbd

			keyboard and serial format: kbd,<serial_device>[,baud]



	kgdbwait	[KGDB] Stop kernel execution and enter the

			kernel debugger at the earliest opportunity.



	kmac=		[MIPS] korina ethernet MAC address.

			Configure the RouterBoard 532 series on-chip

MAINTAINERS

+4 −2
Original line number Diff line number Diff line
@@ -3319,15 +3319,17 @@ F: include/linux/key-type.h 
F:	include/keys/

F:	security/keys/



KGDB

KGDB / KDB /debug_core

M:	Jason Wessel <jason.wessel@windriver.com>

W:	http://kgdb.wiki.kernel.org/

L:	kgdb-bugreport@lists.sourceforge.net

S:	Maintained

F:	Documentation/DocBook/kgdb.tmpl

F:	drivers/misc/kgdbts.c

F:	drivers/serial/kgdboc.c

F:	include/linux/kdb.h

F:	include/linux/kgdb.h

F:	kernel/kgdb.c

F:	kernel/debug/



KMEMCHECK

M:	Vegard Nossum <vegardno@ifi.uio.no>

arch/arm/include/asm/kmap_types.h

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ enum km_type { 
	KM_SOFTIRQ1,

	KM_L1_CACHE,

	KM_L2_CACHE,

	KM_KDB,

	KM_TYPE_NR

};

arch/arm/kernel/kgdb.c

+5 −0
Original line number Diff line number Diff line
@@ -98,6 +98,11 @@ sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *task) 
	gdb_regs[_CPSR]		= thread_regs->ARM_cpsr;

}



void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long pc)

{

	regs->ARM_pc = pc;

}



static int compiled_break;



int kgdb_arch_handle_exception(int exception_vector, int signo,

CRA Git | Maintained and supported by SUSTech CRA and CCSE