Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[pandora-kernel.git] / arch / arm / kernel / hibernate.c

diff --git a/arch/arm/kernel/hibernate.c b/arch/arm/kernel/hibernate.c
index c4cc50e..a71501f 100644 (file)
--- a/arch/arm/kernel/hibernate.c
+++ b/arch/arm/kernel/hibernate.c
@@ -22,6 +22,7 @@
 #include <asm/suspend.h>
 #include <asm/memory.h>
 #include <asm/sections.h>
+#include "reboot.h"
 
 int pfn_is_nosave(unsigned long pfn)
 {
@@ -61,7 +62,7 @@ static int notrace arch_save_image(unsigned long unused)
 
        ret = swsusp_save();
        if (ret == 0)
-               soft_restart(virt_to_phys(cpu_resume));
+               _soft_restart(virt_to_phys(cpu_resume), false);
        return ret;
 }
 
@@ -86,7 +87,7 @@ static void notrace arch_restore_image(void *unused)
        for (pbe = restore_pblist; pbe; pbe = pbe->next)
                copy_page(pbe->orig_address, pbe->address);
 
-       soft_restart(virt_to_phys(cpu_resume));
+       _soft_restart(virt_to_phys(cpu_resume), false);
 }
 
 static u64 resume_stack[PAGE_SIZE/2/sizeof(u64)] __nosavedata;
@@ -99,7 +100,6 @@ static u64 resume_stack[PAGE_SIZE/2/sizeof(u64)] __nosavedata;
  */
 int swsusp_arch_resume(void)
 {
-       extern void call_with_stack(void (*fn)(void *), void *arg, void *sp);
        call_with_stack(arch_restore_image, 0,
                resume_stack + ARRAY_SIZE(resume_stack));
        return 0;