The patch titled x86: fix kernel panic on i386 machine when booting with profile=2 has been added to the -mm tree. Its filename is x86-fix-kernel-panic-on-i386-machine-when-booting-with-profile=2.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this 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 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