Re: [PATCH v2 8/10] x86/timer: use platform feature to choose timer init function

[Thomas Gleixner <tglx@linutronix.de>]

On Thu, 16 Jul 2009, Pan, Jacob jun wrote:
>  
>  #ifdef CONFIG_X86_IO_APIC
> -	if (timer_ack) {
> +	if (timer_ack && platform_has(X86_PLATFORM_FEATURE_8259)) {

  Why is timer ack set at all ?

>  		/*
>  		 * Subtle, when I/O APICs are used we have to ack timer IRQ
>  		 * manually to deassert NMI lines for the watchdog if run

> @@ -118,9 +120,26 @@ void __init hpet_time_init(void)
>  {
>  	if (!hpet_enable())
>  		setup_pit_timer();
> +}
> +#ifndef CONFIG_PARAVIRT
> +static inline void __init native_time_init(void)
> +{
> +	if (platform_has(X86_PLATFORM_FEATURE_HPET))
> +		hpet_time_init();
> +	else if (platform_has(X86_PLATFORM_FEATURE_APBT)) {
> +		apbt_enable();
> +	} else {
> +		/* should not get here, at least one timer should be found */
> +		BUG();
> +	}
>  	x86_quirk_time_init();
>  }
> +static inline void (*choose_time_init(void))(void)
> +{
> +	return native_time_init;
> +}

As I said before. This needs to be cleaned up together with the whole
paravirt mess.

Thanks,

	tglx