From: Chen Yu <yu.c.chen@intel.com>
To: Thomas Gleixner <tglx@linutronix.de>,
"Rafael J. Wysocki" <rafael@kernel.org>
Cc: Pavel Machek <pavel@ucw.cz>, Len Brown <len.brown@intel.com>,
Zhimin Gu <kookoo.gu@intel.com>, Chen Yu <yu.c.chen@intel.com>,
x86@kernel.org, linux-pm@vger.kernel.org,
linux-kernel@vger.kernel.org,
"Rafael J. Wysocki" <rjw@rjwysocki.net>
Subject: [PATCH 06/12][v4] x86, hibernate: Rename temp_level4_pgt to temp_pgt
Date: Fri, 21 Sep 2018 14:27:40 +0800 [thread overview]
Message-ID: <490c2c562f8e6ed1864d9daf3fcf21ab8ca92538.1537448058.git.yu.c.chen@intel.com> (raw)
In-Reply-To: <cover.1537448058.git.yu.c.chen@intel.com>
From: Zhimin Gu <kookoo.gu@intel.com>
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.
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
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>
---
arch/x86/include/asm/suspend.h | 2 +-
arch/x86/power/hibernate.c | 2 +-
arch/x86/power/hibernate_64.c | 2 +-
arch/x86/power/hibernate_asm_64.S | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/include/asm/suspend.h b/arch/x86/include/asm/suspend.h
index 40b02558749f..a892494ca5e4 100644
--- a/arch/x86/include/asm/suspend.h
+++ b/arch/x86/include/asm/suspend.h
@@ -7,7 +7,7 @@
extern unsigned long restore_jump_address __visible;
extern unsigned long jump_address_phys;
extern unsigned long restore_cr3 __visible;
-extern unsigned long temp_level4_pgt __visible;
+extern unsigned long temp_pgt __visible;
extern unsigned long relocated_restore_code __visible;
extern int relocate_restore_code(void);
/* Defined in hibernate_asm_32/64.S */
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 */
--
2.17.1
next prev parent reply other threads:[~2018-09-21 6:20 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-21 6:24 [PATCH 00/12][v4] Backport several fixes from 64bits to 32bits hibernation Chen Yu
2018-09-21 6:26 ` [PATCH 01/12][v4] x86, hibernate: Fix nosave_regions setup for hibernation Chen Yu
2018-09-21 6:26 ` [PATCH 02/12][v4] PM / hibernate: Check the success of generating md5 digest before hibernation Chen Yu
2018-09-21 6:26 ` [PATCH 03/12][v4] x86-32/asm/power: Create stack frames in hibernate_asm_32.S Chen Yu
2018-09-21 6:26 ` [PATCH 04/12][v4] x86, hibernate: Extract the common code of 64/32 bit system Chen Yu
2018-09-21 6:27 ` [PATCH 05/12][v4] x86-32, hibernate: Enable CONFIG_ARCH_HIBERNATION_HEADER on 32bit system Chen Yu
2018-09-21 6:27 ` Chen Yu [this message]
2018-09-21 6:27 ` [PATCH 07/12][v4] x86-32, hibernate: Use temp_pgt as the temporary page table Chen Yu
2018-09-21 11:21 ` Pavel Machek
2018-09-21 6:28 ` [PATCH 08/12][v4] x86-32, hibernate: Use the page size macro instead of constant value Chen Yu
2018-09-21 6:28 ` [PATCH 09/12][v4] x86-32, hibernate: Switch to original page table after resumed Chen Yu
2018-09-21 6:28 ` [PATCH 10/12][v4] x86-32, hibernate: Switch to relocated restore code during resume on 32bit system Chen Yu
2018-09-21 6:28 ` [PATCH 11/12][v4] x86-32, hibernate: Set up temporary text mapping for " Chen Yu
2018-09-21 6:28 ` [PATCH 12/12][v4] x86-32, hibernate: Adjust in_suspend after resumed on " Chen Yu
2018-10-02 9:20 ` [PATCH 00/12][v4] Backport several fixes from 64bits to 32bits hibernation Thomas Gleixner
2018-10-05 9:49 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=490c2c562f8e6ed1864d9daf3fcf21ab8ca92538.1537448058.git.yu.c.chen@intel.com \
--to=yu.c.chen@intel.com \
--cc=kookoo.gu@intel.com \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=rafael@kernel.org \
--cc=rjw@rjwysocki.net \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.