diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-05-18 09:12:45 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-05-18 09:12:51 +0200 |
commit | b286e21868ea1af724a7a4802da2c8e144fa70de (patch) | |
tree | 75a3e57a00cf70aab372b5583d2b7bf7f053cbea /arch/x86/kernel | |
parent | ed077b58f6146684069975122b1728a9d248a501 (diff) | |
parent | 1406de8e11eb043681297adf86d6892ff8efc27a (diff) | |
download | linux-b286e21868ea1af724a7a4802da2c8e144fa70de.tar.gz linux-b286e21868ea1af724a7a4802da2c8e144fa70de.tar.bz2 linux-b286e21868ea1af724a7a4802da2c8e144fa70de.zip |
Merge commit 'v2.6.30-rc6' into x86/mm
Merge reason: sync up to -rc6 which has changes to mm/ which we are
going to touch in the commits to follow as well.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel')
-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 eedfaebe1063..b1f4dffb919e 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 } /** |