Merge branch 'timers/urgent' into x86/xen
[linux-2.6.git] / arch / x86 / kernel / cpu / common.c
index 4e456bd..9983bc3 100644 (file)
@@ -728,14 +728,3 @@ void __cpuinit cpu_init(void)
        mxcsr_feature_mask_init();
 }
 
-#ifdef CONFIG_HOTPLUG_CPU
-void __cpuinit cpu_uninit(void)
-{
-       int cpu = raw_smp_processor_id();
-       cpu_clear(cpu, cpu_initialized);
-
-       /* lazy TLB state */
-       per_cpu(cpu_tlbstate, cpu).state = 0;
-       per_cpu(cpu_tlbstate, cpu).active_mm = &init_mm;
-}
-#endif