1 files changed, 4 insertions, 22 deletions

diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
index 2a8ccb9238b4..ca80394ef5b8 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -86,30 +86,12 @@ void exit_idle(void)
         __exit_idle();
 }
 
-#ifdef CONFIG_HOTPLUG_CPU
-DECLARE_PER_CPU(int, cpu_state);
-
-#include <linux/nmi.h>
-/* We halt the CPU with physical CPU hotplug */
-static inline void play_dead(void)
-{
-        idle_task_exit();
-        c1e_remove_cpu(raw_smp_processor_id());
-
-        mb();
-        /* Ack it */
-        __get_cpu_var(cpu_state) = CPU_DEAD;
-
-        local_irq_disable();
-        /* mask all interrupts, flush any and all caches, and halt */
-        wbinvd_halt();
-}
-#else
+#ifndef CONFIG_SMP
 static inline void play_dead(void)
 {
         BUG();
 }
-#endif /* CONFIG_HOTPLUG_CPU */
+#endif
 
 /*
  * The idle thread. There's no useful work to be
@@ -754,12 +736,12 @@ unsigned long get_wchan(struct task_struct *p)
         if (!p || p == current || p->state == TASK_RUNNING)
                 return 0;
         stack = (unsigned long)task_stack_page(p);
-        if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE)
+        if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
                 return 0;
         fp = *(u64 *)(p->thread.sp);
         do {
                 if (fp < (unsigned long)stack ||
-                    fp > (unsigned long)stack+THREAD_SIZE)
+                    fp >= (unsigned long)stack+THREAD_SIZE)
                         return 0;
                 ip = *(u64 *)(fp+8);
                 if (!in_sched_functions(ip))