x86-32, hibernate: Use temp_pgt as the temporary page table

This is to reuse the temp_pgt for both 32bit and 64bit
system.

No intentional behavior change.

Signed-off-by: Zhimin Gu <kookoo.gu@intel.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Chen Yu <yu.c.chen@intel.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/arch/x86/power/hibernate_32.c b/arch/x86/power/hibernate_32.c
index f82fbd2..a44bdad 100644 (file)
--- a/arch/x86/power/hibernate_32.c
+++ b/arch/x86/power/hibernate_32.c
@@ -156,6 +156,8 @@ asmlinkage int swsusp_arch_resume(void)
        if (error)
                return error;
 
+       temp_pgt = __pa(resume_pg_dir);
+
        /* We have got enough memory and from now on we cannot recover */
        restore_image();
        return 0;

diff --git a/arch/x86/power/hibernate_asm_32.S b/arch/x86/power/hibernate_asm_32.S
index 671d38d..f0627cf 100644 (file)
--- a/arch/x86/power/hibernate_asm_32.S
+++ b/arch/x86/power/hibernate_asm_32.S
@@ -33,8 +33,7 @@ ENDPROC(swsusp_arch_suspend)
 
 ENTRY(restore_image)
        movl    mmu_cr4_features, %ecx
-       movl    resume_pg_dir, %eax
-       subl    $__PAGE_OFFSET, %eax
+       movl    temp_pgt, %eax
        movl    %eax, %cr3
 
        jecxz   1f      # cr4 Pentium and higher, skip if zero