* Yinghai Lu <yhlu.kernel@gmail.com> wrote:

quoted text
> Signed-of-by: Yinghai Lu <yhlu.kernel@gmail.com>

applied to tip/irq/sparseirq - thanks Yinghai.

btw., why was this bit needed:

quoted text
> @@ -659,6 +575,7 @@ static int __init calibrate_APIC_clock(v
>  	delta = lapic_cal_t1 - lapic_cal_t2;
>  	apic_printk(APIC_VERBOSE, "... lapic delta = %ld\n", delta);
>  
> +#ifdef CONFIG_X86_PM_TIMER
>  	/* Check, if the PM timer is available */
>  	deltapm = lapic_cal_pm2 - lapic_cal_pm1;
>  	apic_printk(APIC_VERBOSE, "... PM timer delta = %ld\n", deltapm);
> @@ -687,6 +604,7 @@ static int __init calibrate_APIC_clock(v
>  		}
>  		pm_referenced = 1;
>  	}
> +#endif

wouldnt this be a (small) fix for the pre-unification 32-bit side as 
well, which we should put into tip/x86/urgent as well?

	Ingo
--
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/