Re: [PATCH 4/7] x86: remove enable_NMI_through_LVT0() entirely

[Cyrill Gorcunov]

On 03/03/2011 11:04 PM, Henrik Kretzschmar wrote:
> This function is not used anywhere in the tree,
> since commit 072b198a4ad48bd722ec6d203d65422a4698eae7
> so it can be removed.
> 
> Signed-off-by: Henrik Kretzschmar <henne@xxxxxxxxxxxxxxxx>
> ---
>  arch/x86/include/asm/apic.h |    1 -
>  arch/x86/kernel/apic/apic.c |   17 -----------------
>  2 files changed, 0 insertions(+), 18 deletions(-)
> 
> diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
> index 6d74dd37..f17d7c5 100644
> --- a/arch/x86/include/asm/apic.h
> +++ b/arch/x86/include/asm/apic.h
> @@ -238,7 +238,6 @@ void register_lapic_address(unsigned long address);
>  extern void setup_boot_APIC_clock(void);
>  extern void setup_secondary_APIC_clock(void);
>  extern int APIC_init_uniprocessor(void);
> -extern void enable_NMI_through_LVT0(void);
>  extern int apic_force_enable(unsigned long addr) __init;
>  
>  /*
> diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
> index 5177aaa..a0e9c1f 100644
> --- a/arch/x86/kernel/apic/apic.c
> +++ b/arch/x86/kernel/apic/apic.c
> @@ -292,23 +292,6 @@ u64 native_apic_icr_read(void)
>  	return icr1 | ((u64)icr2 << 32);
>  }
>  
> -/**
> - * enable_NMI_through_LVT0 - enable NMI through local vector table 0
> - */
> -void __cpuinit enable_NMI_through_LVT0(void)
> -{
> -	unsigned int v;
> -
> -	/* unmask and set to NMI */
> -	v = APIC_DM_NMI;
> -
> -	/* Level triggered for 82489DX (32bit mode) */
> -	if (!lapic_is_integrated())
> -		v |= APIC_LVT_LEVEL_TRIGGER;
> -
> -	apic_write(APIC_LVT0, v);
> -}
> -
>  #ifdef CONFIG_X86_32
>  /**
>   * get_physical_broadcast - Get number of physical broadcast IDs

Seems to be a leftover since nmi-watchdog via io-apic. Good for me.
Acked-by: Cyrill Gorcunov <gorcunov@xxxxxxxxxx>

CC'ing Don.
-- 
    Cyrill
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/