UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Zhimin Gu 2018-09-21 14:27:51 +08:00 committed by Rafael J. Wysocki
parent 72adf47764
commit 7c0a982750
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/power/hibernate_32.c
View File

@ -156,6 +156,8 @@ asmlinkage int swsusp_arch_resume(void)
if (error) if (error)
return error; return error;
temp_pgt = __pa(resume_pg_dir);
/* We have got enough memory and from now on we cannot recover */ /* We have got enough memory and from now on we cannot recover */
restore_image(); restore_image();
return 0; return 0;

3
arch/x86/power/hibernate_asm_32.S
View File

@ -33,8 +33,7 @@ ENDPROC(swsusp_arch_suspend)
ENTRY(restore_image) ENTRY(restore_image)
movl mmu_cr4_features, %ecx movl mmu_cr4_features, %ecx
movl resume_pg_dir, %eax movl temp_pgt, %eax
subl $__PAGE_OFFSET, %eax
movl %eax, %cr3 movl %eax, %cr3
jecxz 1f # cr4 Pentium and higher, skip if zero jecxz 1f # cr4 Pentium and higher, skip if zero