Fix kernel panic on i386 machine when booting with profile=2
diff mbox series

Message ID F7C8A4D3A9905B45A80E4C194793FA6515538BDFC7@PDSMSX501.ccr.corp.intel.com
State New, archived
Headers show
Series
  • Fix kernel panic on i386 machine when booting with profile=2
Related show

Commit Message

Alex Shi Oct. 1, 2009, 3:23 a.m. UTC
Latest kernel has a kernel panic in booting on i386 machine when profile=2
setting in cmdline. Find it is due to 'sp' incorrect in profile_pc function.

BUG: unable to handle kernel NULL pointer dereference at 00000246
IP: [<c01288b6>] profile_pc+0x2a/0x48
*pde = 00000000
Oops: 0000 [#1] SMP

Signed-off-by: Alex Shi <alex.shi@intel.com>
---
 arch/x86/kernel/time.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

Patch
diff mbox series

diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
index dcb00d2..c4fedca 100644
--- a/arch/x86/kernel/time.c
+++ b/arch/x86/kernel/time.c
@@ -38,7 +38,12 @@  unsigned long profile_pc(struct pt_regs *regs)
 #ifdef CONFIG_FRAME_POINTER
 		return *(unsigned long *)(regs->bp + sizeof(long));
 #else
+#ifdef CONFIG_X86_32
+		unsigned long *sp = (unsigned long *)&regs->sp;
+#else
 		unsigned long *sp = (unsigned long *)regs->sp;
+
+#endif
 		/*
 		 * Return address is either directly at stack pointer
 		 * or above a saved flags. Eflags has bits 22-31 zero,