Merge branch 'timers/urgent' into x86/xen

Conflicts:
	arch/x86/kernel/process_32.c
	arch/x86/kernel/process_64.c

Manual merge:

	arch/x86/kernel/smpboot.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc arch/x86/kernel/cpu/common.c
Simple merge

diff --cc arch/x86/kernel/smpboot.c
index 66b04e598817f052b98ce9ee5ad9244278363144,7985c5b3f9162ba14c0817ce25f1297b34a87a5c..06f1407d55423507c920b9d1c0c19827098cc057
--- 1/arch/x86/kernel/smpboot.c
--- 2/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@@ -52,6 -52,6 +52,7 @@@
  #include <asm/desc.h>
  #include <asm/nmi.h>
  #include <asm/irq.h>
++#include <asm/idle.h>
  #include <asm/smp.h>
  #include <asm/trampoline.h>
  #include <asm/cpu.h>
@@@ -1408,31 -1402,8 +1409,32 @@@ void native_cpu_die(unsigned int cpu
        }
        printk(KERN_ERR "CPU %u didn't die...\n", cpu);
  }
 +
 +void play_dead_common(void)
 +{
 +      idle_task_exit();
 +      reset_lazy_tlbstate();
 +      irq_ctx_exit(raw_smp_processor_id());
++      c1e_remove_cpu(raw_smp_processor_id());
 +
 +      mb();
 +      /* Ack it */
 +      __get_cpu_var(cpu_state) = CPU_DEAD;
 +
 +      /*
 +       * With physical CPU hotplug, we should halt the cpu
 +       */
 +      local_irq_disable();
 +}
 +
 +void native_play_dead(void)
 +{
 +      play_dead_common();
 +      wbinvd_halt();
 +}
 +
  #else /* ... !CONFIG_HOTPLUG_CPU */
 -int __cpu_disable(void)
 +int native_cpu_disable(void)
  {
        return -ENOSYS;
  }