[PATCH 07/12][RFC v3] x86-32, hibernate: Use temp_pgt as the temporary page table

[Chen Yu]

From: Zhimin Gu <kookoo...@intel.com>

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

No functional change.

Cc: "Rafael J. Wysocki" <r...@rjwysocki.net>
Signed-off-by: Zhimin Gu <kookoo...@intel.com>
Signed-off-by: Chen Yu <yu.c.c...@intel.com>
---
 arch/x86/power/hibernate_32.c     | 2 ++
 arch/x86/power/hibernate_asm_32.S | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/x86/power/hibernate_32.c b/arch/x86/power/hibernate_32.c
index f82fbd279d08..a44bdada4e4e 100644
--- 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 671d38d0d931..f0627cf30a36 100644
--- 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
-- 
2.17.1