diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-05 18:32:18 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-05 18:32:18 -0500 |
commit | c2ed69cdc9da49a8d2d7b4212fd225abf902ceaa (patch) | |
tree | ae98c43f8f9e0828b64e0d8fca2d6402f424bf77 /arch/x86/kernel/process_32.c | |
parent | ef26b1691d11e17af205a4ff9c91458d931d11db (diff) | |
parent | 9eaa192d8988d621217a9e6071cd403fd6010496 (diff) |
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Fix a section mismatch in arch/x86/kernel/setup.c
x86: Fixup last users of irq_chip->typename
x86: Remove BKL from apm_32
x86: Remove BKL from microcode
x86: use kernel_stack_pointer() in kprobes.c
x86: use kernel_stack_pointer() in kgdb.c
x86: use kernel_stack_pointer() in dumpstack.c
x86: use kernel_stack_pointer() in process_32.c
Diffstat (limited to 'arch/x86/kernel/process_32.c')
-rw-r--r-- | arch/x86/kernel/process_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index d5bd3132ee70..540140284f60 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c | |||
@@ -135,7 +135,7 @@ void __show_regs(struct pt_regs *regs, int all) | |||
135 | ss = regs->ss & 0xffff; | 135 | ss = regs->ss & 0xffff; |
136 | gs = get_user_gs(regs); | 136 | gs = get_user_gs(regs); |
137 | } else { | 137 | } else { |
138 | sp = (unsigned long) (®s->sp); | 138 | sp = kernel_stack_pointer(regs); |
139 | savesegment(ss, ss); | 139 | savesegment(ss, ss); |
140 | savesegment(gs, gs); | 140 | savesegment(gs, gs); |
141 | } | 141 | } |