Re: [RFC v1 01/28] x86, irq: Kill unused setup_timer_IRQ0_pin()

[Jiang Liu]

Hi Thomas,
	This patch has dependency on your patchset to remove
the last caller of setup_timer_IRQ0_pin(). What's the best
way to solve this dependency? Should I pull your patches or
just keeping the temporary "#if 0"?
Regards!
Gerry

On 2014/9/26 22:57, Jiang Liu wrote:
> Now there's no user of setup_timer_IRQ0_pin(), so kill it.
> 
> Signed-off-by: Jiang Liu <jiang.liu@xxxxxxxxxxxxxxx>
> ---
> Hi all,
> 	This patch depends on Thomas' work to remove the last caller of
> setup_timer_IRQ0_pin(). So the "#if 0" is intended, so it won't block
> following up patches.
> Regards!
> Gerry
> ---
>  arch/x86/include/asm/io_apic.h          |    1 -
>  arch/x86/kernel/apic/io_apic.c          |   17 -----------------
>  arch/x86/platform/intel-mid/intel-mid.c |    2 ++
>  3 files changed, 2 insertions(+), 18 deletions(-)
> 
> diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h
> index 7bf86bfe05b1..f9a99bc28981 100644
> --- a/arch/x86/include/asm/io_apic.h
> +++ b/arch/x86/include/asm/io_apic.h
> @@ -204,7 +204,6 @@ extern int mp_irqdomain_map(struct irq_domain *domain, unsigned int virq,
>  			    irq_hw_number_t hwirq);
>  extern void mp_irqdomain_unmap(struct irq_domain *domain, unsigned int virq);
>  extern int mp_set_gsi_attr(u32 gsi, int trigger, int polarity, int node);
> -extern void __init pre_init_apic_IRQ0(void);
>  
>  extern void mp_save_irq(struct mpc_intsrc *m);
>  extern bool mp_should_keep_irq(struct device *dev);
> diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
> index 37796fcd33e2..5cccf8989507 100644
> --- a/arch/x86/kernel/apic/io_apic.c
> +++ b/arch/x86/kernel/apic/io_apic.c
> @@ -3091,20 +3091,3 @@ bool mp_should_keep_irq(struct device *dev)
>  
>  	return false;
>  }
> -
> -/* Enable IOAPIC early just for system timer */
> -void __init pre_init_apic_IRQ0(void)
> -{
> -	struct io_apic_irq_attr attr = { 0, 0, 0, 0 };
> -
> -	printk(KERN_INFO "Early APIC setup for system timer0\n");
> -#ifndef CONFIG_SMP
> -	physid_set_mask_of_physid(boot_cpu_physical_apicid,
> -					 &phys_cpu_present_map);
> -#endif
> -	setup_local_APIC();
> -
> -	io_apic_setup_irq_pin(0, 0, &attr);
> -	irq_set_chip_and_handler_name(0, &ioapic_chip, handle_edge_irq,
> -				      "edge");
> -}
> diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
> index 1bbedc4b0f88..f8855b703cab 100644
> --- a/arch/x86/platform/intel-mid/intel-mid.c
> +++ b/arch/x86/platform/intel-mid/intel-mid.c
> @@ -99,7 +99,9 @@ static void __init intel_mid_time_init(void)
>  		return;
>  	}
>  	/* we need at least one APB timer */
> +#if 0
>  	pre_init_apic_IRQ0();
> +#endif
>  	apbt_time_init();
>  }
>  
> 
--
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/