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 /arch/x86/kernel/setup.c | |
| parent | 90b9a32d8f441369b2f97a765d2d957b531eb653 (diff) | |
| parent | 4fe1da4ebc18c4c42fa56c228447f68033fce5f0 (diff) | |
| download | kernel_samsung_crespo-ac3ee84c604502240122c47b52f0542ec8774f15.zip kernel_samsung_crespo-ac3ee84c604502240122c47b52f0542ec8774f15.tar.gz kernel_samsung_crespo-ac3ee84c604502240122c47b52f0542ec8774f15.tar.bz2 | |
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 'arch/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index c4851ef..e802989 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -725,6 +725,7 @@ void __init setup_arch(char **cmdline_p) /* VMI may relocate the fixmap; do this before touching ioremap area */ vmi_init(); + early_trap_init(); early_cpu_init(); early_ioremap_init(); |