The patch titled
x86: fix kernel panic on i386 machine when booting with profile=2
has been removed from the -mm tree. Its filename was
x86-fix-kernel-panic-on-i386-machine-when-booting-with-profile=2.patch
This patch was dropped because an alternative patch was merged
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: x86: fix kernel panic on i386 machine when booting with profile=2
From: "Shi, Alex" <alex.shi@xxxxxxxxx>
Latest kernel has a kernel panic in booting on i386 machine when profile=2
setting in cmdline. It is due to 'sp' being incorrect in profile_pc().
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@xxxxxxxxx>
Cc: "Chen, Tim C" <tim.c.chen@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Cc: "Rafael J. Wysocki" <rjw@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/kernel/time.c | 5 +++++
1 file changed, 5 insertions(+)
diff -puN arch/x86/kernel/time.c~x86-fix-kernel-panic-on-i386-machine-when-booting-with-profile=2 arch/x86/kernel/time.c
--- a/arch/x86/kernel/time.c~x86-fix-kernel-panic-on-i386-machine-when-booting-with-profile=2
+++ a/arch/x86/kernel/time.c
@@ -38,7 +38,12 @@ unsigned long profile_pc(struct pt_regs
#ifdef CONFIG_FRAME_POINTER
return *(unsigned long *)(regs->bp + sizeof(long));
#else
+#ifdef CONFIG_X86_32
+ unsigned long *sp = (unsigned long *)®s->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,
_
Patches currently in -mm which might be from alex.shi@xxxxxxxxx are
origin.patch
x86-fix-kernel-panic-on-i386-machine-when-booting-with-profile=2.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
