From d04aadccb0a4105106a1c72cb4f3cd8e32d2dfc3 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Mon, 12 Oct 2009 11:32:31 -0700 Subject: [PATCH] --- yaml --- r: 167446 b: refs/heads/master c: d1705c558c95418378b11a0be963fe1b3e2fa381 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/time.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4cbbe5a234fc..f77d389d9cad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a4b7e5e741fe0a72a517b0367a2659aa53f7c44 +refs/heads/master: d1705c558c95418378b11a0be963fe1b3e2fa381 diff --git a/trunk/arch/x86/kernel/time.c b/trunk/arch/x86/kernel/time.c index dcb00d278512..be2573448ed9 100644 --- a/trunk/arch/x86/kernel/time.c +++ b/trunk/arch/x86/kernel/time.c @@ -38,7 +38,8 @@ unsigned long profile_pc(struct pt_regs *regs) #ifdef CONFIG_FRAME_POINTER return *(unsigned long *)(regs->bp + sizeof(long)); #else - unsigned long *sp = (unsigned long *)regs->sp; + unsigned long *sp = + (unsigned long *)kernel_stack_pointer(regs); /* * Return address is either directly at stack pointer * or above a saved flags. Eflags has bits 22-31 zero,