diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-15 08:06:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-15 08:06:45 -0700 |
| commit | ade385e4d14f4158b3b27acd992a98bca4cd7f23 (patch) | |
| tree | 9f20430f5690901936348b0c955327c4a37d3485 /arch | |
| parent | c6538499814d8112c5d4d08570a7cf0758e5f8f5 (diff) | |
| parent | d34a792da969a00b0f653c512414411760f55a20 (diff) | |
| download | linux-3.10-ade385e4d14f4158b3b27acd992a98bca4cd7f23.tar.gz linux-3.10-ade385e4d14f4158b3b27acd992a98bca4cd7f23.tar.bz2 linux-3.10-ade385e4d14f4158b3b27acd992a98bca4cd7f23.zip | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
kgdb: gdb documentation fix
kgdb,i386: use address that SP register points to in the exception frame
sysrq, intel_fb: fix sysrq g collision
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/kgdb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c index eedfaebe106..b1f4dffb919 100644 --- a/arch/x86/kernel/kgdb.c +++ b/arch/x86/kernel/kgdb.c @@ -88,6 +88,7 @@ void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs) gdb_regs[GDB_SS] = __KERNEL_DS; gdb_regs[GDB_FS] = 0xFFFF; gdb_regs[GDB_GS] = 0xFFFF; + gdb_regs[GDB_SP] = (int)®s->sp; #else gdb_regs[GDB_R8] = regs->r8; gdb_regs[GDB_R9] = regs->r9; @@ -100,8 +101,8 @@ void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs) gdb_regs32[GDB_PS] = regs->flags; gdb_regs32[GDB_CS] = regs->cs; gdb_regs32[GDB_SS] = regs->ss; -#endif gdb_regs[GDB_SP] = regs->sp; +#endif } /** |