Re: [PATCH 1/7] i386, dumpstack: Move crash_kexec before bust_spinlocks(0) in oops_end

Neil Horman
2008-10-22T10:51:24Z

On Wed, Oct 22, 2008 at 12:00:08PM +0200, Alexander van Heukelum wrote:
> crash_kexec should not be called with console_sem held. Move
> the call before bust_spinlocks(0) in oops_end to avoid the
> problem.
>
> Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
> Cc: "Neil Horman" <nhorman@tuxdriver.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>

> ---
> arch/x86/kernel/dumpstack_32.c | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
> index b361475..5493d31 100644
> --- a/arch/x86/kernel/dumpstack_32.c
> +++ b/arch/x86/kernel/dumpstack_32.c
> @@ -309,6 +309,9 @@ unsigned __kprobes long oops_begin(void)
>
> void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
> {
> + if (regs && kexec_should_crash(current))
> + crash_kexec(regs);
> +
> bust_spinlocks(0);
> die_owner = -1;
> add_taint(TAINT_DIE);
> @@ -318,8 +321,6 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
> if (!regs)
> return;
>
> - if (kexec_should_crash(current))
> - crash_kexec(regs);
> if (in_interrupt())
> panic("Fatal exception in interrupt");
> if (panic_on_oops)
> --
> 1.5.4.3
>
>

--
/****************************************************
* Neil Horman <nhorman@tuxdriver.com>
* Software Engineer, Red Hat
****************************************************/