lkml.org 
[lkml]   [2008]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 43/79] [PATCH] call nmi_watchdog_default in i386
    Date
    From: Glauber Costa <gcosta@redhat.com>

    this does not exist, so it will be an empty macro

    Signed-off-by: Glauber Costa <gcosta@redhat.com>
    ---
    arch/x86/kernel/smpboot_32.c | 1 +
    include/asm-x86/nmi.h | 4 +++-
    2 files changed, 4 insertions(+), 1 deletions(-)

    diff --git a/arch/x86/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c
    index 1f3aff4..a350553 100644
    --- a/arch/x86/kernel/smpboot_32.c
    +++ b/arch/x86/kernel/smpboot_32.c
    @@ -876,6 +876,7 @@ static void __init smp_boot_cpus(unsigned int max_cpus)
    who understands all this stuff should rewrite it properly. --RR 15/Jul/02 */
    void __init native_smp_prepare_cpus(unsigned int max_cpus)
    {
    + nmi_watchdog_default();
    smp_commenced_mask = cpumask_of_cpu(0);
    cpu_callin_map = cpumask_of_cpu(0);
    mb();
    diff --git a/include/asm-x86/nmi.h b/include/asm-x86/nmi.h
    index 2b94199..1e36302 100644
    --- a/include/asm-x86/nmi.h
    +++ b/include/asm-x86/nmi.h
    @@ -39,6 +39,9 @@ static inline void unset_nmi_pm_callback(struct pm_dev *dev)
    #ifdef CONFIG_X86_64
    extern void default_do_nmi(struct pt_regs *);
    extern void die_nmi(char *str, struct pt_regs *regs, int do_panic);
    +extern void nmi_watchdog_default(void);
    +#else
    +#define nmi_watchdog_default() do {} while (0)
    #endif

    extern int check_nmi_watchdog(void);
    @@ -50,7 +53,6 @@ extern int reserve_perfctr_nmi(unsigned int);
    extern void release_perfctr_nmi(unsigned int);
    extern int reserve_evntsel_nmi(unsigned int);
    extern void release_evntsel_nmi(unsigned int);
    -extern void nmi_watchdog_default(void);

    extern void setup_apic_nmi_watchdog(void *);
    extern void stop_apic_nmi_watchdog(void *);
    --
    1.5.0.6


    \
     
     \ /
      Last update: 2008-03-19 21:33    [W:0.031 / U:0.296 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site