1 files changed, 10 insertions, 10 deletions

diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
index de17c89985db..1c0a9be2ffa8 100644
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@ -33,6 +33,7 @@
 #include <linux/kallsyms.h>
 #include <linux/init.h>
 #include <linux/cpu.h>
+#include <linux/cpuidle.h>
 #include <linux/elfcore.h>
 #include <linux/pm.h>
 #include <linux/tick.h>
@@ -84,11 +85,6 @@ EXPORT_SYMBOL_GPL(pm_power_off);
 void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd);
 EXPORT_SYMBOL_GPL(arm_pm_restart);
 
-void arch_cpu_idle_prepare(void)
-{
-        local_fiq_enable();
-}
-
 /*
  * This is our default idle handler.
  */
@@ -98,8 +94,10 @@ void arch_cpu_idle(void)
          * This should do all the clock switching and wait for interrupt
          * tricks
          */
-        cpu_do_idle();
-        local_irq_enable();
+        if (cpuidle_idle_call()) {
+                cpu_do_idle();
+                local_irq_enable();
+        }
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
@@ -135,7 +133,6 @@ void machine_restart(char *cmd)
 
         /* Disable interrupts first */
         local_irq_disable();
-        local_fiq_disable();
 
         /* Now call the architecture specific reboot code. */
         if (arm_pm_restart)
@@ -308,6 +305,7 @@ struct task_struct *__switch_to(struct task_struct *prev,
 unsigned long get_wchan(struct task_struct *p)
 {
         struct stackframe frame;
+        unsigned long stack_page;
         int count = 0;
         if (!p || p == current || p->state == TASK_RUNNING)
                 return 0;
@@ -315,9 +313,11 @@ unsigned long get_wchan(struct task_struct *p)
         frame.fp = thread_saved_fp(p);
         frame.sp = thread_saved_sp(p);
         frame.pc = thread_saved_pc(p);
+        stack_page = (unsigned long)task_stack_page(p);
         do {
-                int ret = unwind_frame(&frame);
-                if (ret < 0)
+                if (frame.sp < stack_page ||
+                    frame.sp >= stack_page + THREAD_SIZE ||
+                    unwind_frame(&frame))
                         return 0;
                 if (!in_sched_functions(frame.pc))
                         return frame.pc;