diff options
| author | Zhimin Gu <kookoo.gu@intel.com> | 2018-09-21 14:27:40 +0800 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-10-03 11:56:34 +0200 |
| commit | 72adf47764a0be66ea0c712c7d5a6b8a81e28449 (patch) | |
| tree | 1c0fc21660fa5271475aa8b8b457a3859dab528d /arch/x86/power | |
| parent | 445565303d19c75858004c129835fa418b740829 (diff) | |
| download | linux-72adf47764a0be66ea0c712c7d5a6b8a81e28449.tar.bz2 | |
x86, hibernate: Rename temp_level4_pgt to temp_pgt
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>
Diffstat (limited to 'arch/x86/power')
| -rw-r--r-- | arch/x86/power/hibernate.c | 2 | ||||
| -rw-r--r-- | arch/x86/power/hibernate_64.c | 2 | ||||
| -rw-r--r-- | arch/x86/power/hibernate_asm_64.S | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/power/hibernate.c b/arch/x86/power/hibernate.c index a04ca13bf592..e3409e4a9b6a 100644 --- a/arch/x86/power/hibernate.c +++ b/arch/x86/power/hibernate.c @@ -36,7 +36,7 @@ unsigned long jump_address_phys; * in the image header). */ unsigned long restore_cr3 __visible; -unsigned long temp_level4_pgt __visible; +unsigned long temp_pgt __visible; unsigned long relocated_restore_code __visible; /** diff --git a/arch/x86/power/hibernate_64.c b/arch/x86/power/hibernate_64.c index 8bc2eb0dc464..239f424ccb29 100644 --- a/arch/x86/power/hibernate_64.c +++ b/arch/x86/power/hibernate_64.c @@ -121,7 +121,7 @@ static int set_up_temporary_mappings(void) return result; } - temp_level4_pgt = __pa(pgd); + temp_pgt = __pa(pgd); return 0; } diff --git a/arch/x86/power/hibernate_asm_64.S b/arch/x86/power/hibernate_asm_64.S index fd369a6e9ff8..3008baa2fa95 100644 --- a/arch/x86/power/hibernate_asm_64.S +++ b/arch/x86/power/hibernate_asm_64.S @@ -59,7 +59,7 @@ ENTRY(restore_image) movq restore_cr3(%rip), %r9 /* prepare to switch to temporary page tables */ - movq temp_level4_pgt(%rip), %rax + movq temp_pgt(%rip), %rax movq mmu_cr4_features(%rip), %rbx /* prepare to copy image data to their original locations */ |