lkml.org 
[lkml]   [2008]   [Nov]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 02/16] x86 kdump: Move crashing_cpu assignment to nmi_shootdown_cpus()
    Date
    This variable will be moved to non-kdump-specific code.

    Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
    ---
    arch/x86/kernel/crash.c | 8 +++++---
    1 files changed, 5 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
    index e8c58aa..0e77fe9 100644
    --- a/arch/x86/kernel/crash.c
    +++ b/arch/x86/kernel/crash.c
    @@ -29,10 +29,11 @@

    #include <mach_ipi.h>

    +#if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC)
    +
    /* This keeps a track of which one is crashing cpu. */
    static int crashing_cpu;

    -#if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC)
    static atomic_t waiting_for_crash_ipi;

    static void kdump_nmi_callback(int cpu, struct die_args *args)
    @@ -97,6 +98,9 @@ static void nmi_shootdown_cpus(void)
    {
    unsigned long msecs;

    + /* Make a note of crashing cpu. Will be used in NMI callback.*/
    + crashing_cpu = safe_smp_processor_id();
    +
    atomic_set(&waiting_for_crash_ipi, num_online_cpus() - 1);
    /* Would it be better to replace the trap vector here? */
    if (register_die_notifier(&crash_nmi_nb))
    @@ -137,8 +141,6 @@ void native_machine_crash_shutdown(struct pt_regs *regs)
    /* The kernel is broken so disable interrupts */
    local_irq_disable();

    - /* Make a note of crashing cpu. Will be used in NMI callback.*/
    - crashing_cpu = safe_smp_processor_id();
    nmi_shootdown_cpus();
    lapic_shutdown();
    #if defined(CONFIG_X86_IO_APIC)
    --
    1.5.5.GIT


    \
     
     \ /
      Last update: 2008-11-04 16:01    [W:0.021 / U:29.648 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site