x86, hibernate: Rename temp_level4_pgt to temp_pgt

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

As 32bit system is not using 4-level page, rename it
to temp_pgt so that it can be reused for both 32bit
and 64bit hibernation.

No functional 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>

authored by

Zhimin Gu and committed by

Rafael J. Wysocki 7 years ago 72adf477 44556530

+4 -4

4 changed files

expand all

arch

x86

include

asm

suspend.h

power

hibernate.c

hibernate_64.c

hibernate_asm_64.S

+1 -1

arch/x86/include/asm/suspend.h

··· 7 7 extern unsigned long restore_jump_address __visible; 8 8 extern unsigned long jump_address_phys; 9 9 extern unsigned long restore_cr3 __visible; 10 - extern unsigned long temp_level4_pgt __visible; 10 + extern unsigned long temp_pgt __visible; 11 11 extern unsigned long relocated_restore_code __visible; 12 12 extern int relocate_restore_code(void); 13 13 /* Defined in hibernate_asm_32/64.S */

+1 -1

arch/x86/power/hibernate.c

··· 36 36 * in the image header). 37 37 */ 38 38 unsigned long restore_cr3 __visible; 39 - unsigned long temp_level4_pgt __visible; 39 + unsigned long temp_pgt __visible; 40 40 unsigned long relocated_restore_code __visible; 41 41 42 42 /**

+1 -1

arch/x86/power/hibernate_64.c

··· 121 121 return result; 122 122 } 123 123 124 - temp_level4_pgt = __pa(pgd); 124 + temp_pgt = __pa(pgd); 125 125 return 0; 126 126 } 127 127

+1 -1

arch/x86/power/hibernate_asm_64.S

··· 59 59 movq restore_cr3(%rip), %r9 60 60 61 61 /* prepare to switch to temporary page tables */ 62 - movq temp_level4_pgt(%rip), %rax 62 + movq temp_pgt(%rip), %rax 63 63 movq mmu_cr4_features(%rip), %rbx 64 64 65 65 /* prepare to copy image data to their original locations */