Merge commit 'v2.6.30' into oprofile/master

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
index 04df67f8a7ba..044897be021f 100644
--- a/arch/x86/oprofile/backtrace.c
+++ b/arch/x86/oprofile/backtrace.c
@@ -76,9 +76,9 @@ void
 x86_backtrace(struct pt_regs * const regs, unsigned int depth)
 {
         struct frame_head *head = (struct frame_head *)frame_pointer(regs);
-        unsigned long stack = kernel_trap_sp(regs);
 
         if (!user_mode_vm(regs)) {
+                unsigned long stack = kernel_stack_pointer(regs);
                 if (depth)
                         dump_trace(NULL, regs, (unsigned long *)stack, 0,
                                    &backtrace_ops, &depth);