On Sat, 23 Oct 2010, Yinghai Lu wrote:

quoted text
> kill mp_sfi_register_lapic_address, they are the same

Except for the difference.
 
quoted text
> Signed-off-by: Yinghai Lu <yinghai@kernel.org>
> ---
>  arch/x86/kernel/sfi.c |   13 +------------
>  1 files changed, 1 insertions(+), 12 deletions(-)
> 
> diff --git a/arch/x86/kernel/sfi.c b/arch/x86/kernel/sfi.c
> index dd4c281..4dc8065 100644
> --- a/arch/x86/kernel/sfi.c
> +++ b/arch/x86/kernel/sfi.c
> @@ -34,17 +34,6 @@
>  #ifdef CONFIG_X86_LOCAL_APIC
>  static unsigned long sfi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE;
>  
> -static void __init mp_sfi_register_lapic_address(unsigned long address)
> -{
> -	mp_lapic_addr = address;
> -
> -	set_fixmap_nocache(FIX_APIC_BASE, mp_lapic_addr);
> -	if (boot_cpu_physical_apicid == -1U)
> -		boot_cpu_physical_apicid = read_apic_id();
> -
> -	pr_info("Boot CPU = %d\n", boot_cpu_physical_apicid);

That pr_info is not really important, but it makes the function
different in the first place.

quoted text
> -}
> -
>  /* All CPUs enumerated by SFI must be present and enabled */
>  static void __cpuinit mp_sfi_register_lapic(u8 id)
>  {
> @@ -110,7 +99,7 @@ static int __init sfi_parse_ioapic(struct sfi_table_header *table)
>  int __init sfi_platform_init(void)
>  {
>  #ifdef CONFIG_X86_LOCAL_APIC
> -	mp_sfi_register_lapic_address(sfi_lapic_addr);
> +	smp_register_lapic_address(sfi_lapic_addr);
>  	sfi_table_parse(SFI_SIG_CPUS, NULL, NULL, sfi_parse_cpus);
>  #endif
>  #ifdef CONFIG_X86_IO_APIC
> -- 
> 1.7.1
> 
--
unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/