diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 11:10:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 11:10:41 -0700 |
| commit | ac3ee84c604502240122c47b52f0542ec8774f15 (patch) | |
| tree | fa74b50e310af6cef3298a052514b2d42b260d6b /init | |
| parent | 90b9a32d8f441369b2f97a765d2d957b531eb653 (diff) | |
| parent | 4fe1da4ebc18c4c42fa56c228447f68033fce5f0 (diff) | |
| download | kernel-crypto-ac3ee84c604502240122c47b52f0542ec8774f15.tar.gz kernel-crypto-ac3ee84c604502240122c47b52f0542ec8774f15.tar.xz kernel-crypto-ac3ee84c604502240122c47b52f0542ec8774f15.zip | |
Merge branch 'dbg-early-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb
* 'dbg-early-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
echi-dbgp: Add kernel debugger support for the usb debug port
earlyprintk,vga,kdb: Fix \b and \r for earlyprintk=vga with kdb
kgdboc: Add ekgdboc for early use of the kernel debugger
x86,early dr regs,kgdb: Allow kernel debugger early dr register access
x86,kgdb: Implement early hardware breakpoint debugging
x86, kgdb, init: Add early and late debug states
x86, kgdb: early trap init for early debug
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c index 372771333d9..22881b5e95e 100644 --- a/init/main.c +++ b/init/main.c @@ -62,7 +62,7 @@ #include <linux/sched.h> #include <linux/signal.h> #include <linux/idr.h> -#include <linux/kdb.h> +#include <linux/kgdb.h> #include <linux/ftrace.h> #include <linux/async.h> #include <linux/kmemcheck.h> @@ -676,7 +676,7 @@ asmlinkage void __init start_kernel(void) buffer_init(); key_init(); security_init(); - kdb_init(KDB_INIT_FULL); + dbg_late_init(); vfs_caches_init(totalram_pages); signals_init(); /* rootfs populating might need page-writeback */ |