Skip to contentSkip to conversation

x86 cleanup: suspend_asm_64.S - use X86_CR4_PGE instead of numeric value

PATCH In review Cyrill Gorcunov 2 participants 3 messages Feb 8, 2008 – Feb 17, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86 cleanup: suspend_asm_64.S - use X86_CR4_PGE instead of numeric value

By including <asm/processor-flags.h> we're allowed to use X86_CR4_PGE instead of numeric constant.

md5 sums of compiled files are differ due to this inclusion but .text section remains the same.

---

If anyone has an objection on this patch - just drop it please.

I'm not sure but this could have a side effect in case of future <asm/processor-flags.h> modifications so it would require __ASSEMBLY__ preprocessor directive.

arch/x86/kernel/suspend_asm_64.S +4 -3
Index: linux-2.6.git/arch/x86/kernel/suspend_asm_64.S
===================================================================
@@ -9,12 +9,13 @@
  * image could very well be data page in "new" image, and overwriting
  * your own stack under you is bad idea.
  */
-	
+
 	.text
 #include <linux/linkage.h>
 #include <asm/segment.h>
 #include <asm/page.h>
 #include <asm/asm-offsets.h>
+#include <asm/processor-flags.h>
 
 ENTRY(swsusp_arch_suspend)
 	movq	$saved_context, %rax
@@ -55,7 +56,7 @@ ENTRY(restore_image)
 	/* Flush TLB */
 	movq	mmu_cr4_features(%rip), %rax
 	movq	%rax, %rdx
-	andq	$~(1<<7), %rdx	# PGE
+	andq	$~(X86_CR4_PGE), %rdx
 	movq	%rdx, %cr4;  # turn off PGE
 	movq	%cr3, %rcx;  # flush TLB
 	movq	%rcx, %cr3;
@@ -107,7 +108,7 @@ ENTRY(restore_registers)
 	/* Flush TLB, including "global" things (vmalloc) */
 	movq	mmu_cr4_features(%rip), %rax
 	movq	%rax, %rdx
-	andq	$~(1<<7), %rdx;  # PGE
+	andq	$~(X86_CR4_PGE), %rdx
 	movq	%rdx, %cr4;  # turn off PGE
 	movq	%cr3, %rcx;  # flush TLB
 	movq	%rcx, %cr3
#1 lore raw
Quoted 5 lines · Cyrill Gorcunov

By including <asm/processor-flags.h> we're allowed to use X86_CR4_PGE instead of numeric constant.

md5 sums of compiled files are differ due to this inclusion but .text section remains the same.

thanks Cyrill, picked it up. (the merged version is below - the target files moved meanwhile)

Ingo

------------->
Subject: x86 cleanup: suspend_asm_64.S - use X86_CR4_PGE instead of numeric value
From: Cyrill Gorcunov <[email protected]>
Date: Sat, 9 Feb 2008 00:49:13 +0300

By including <asm/processor-flags.h> we're allowed to use X86_CR4_PGE instead of numeric constant.

md5 sums of compiled files are differ due to this inclusion but .text section remains the same.

---
 arch/x86/power/hibernate_asm_64.S |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/x86/power/hibernate_asm_64.S +3 -2
Index: linux-x86.q/arch/x86/power/hibernate_asm_64.S
===================================================================
@@ -20,6 +20,7 @@
 #include <asm/segment.h>
 #include <asm/page.h>
 #include <asm/asm-offsets.h>
+#include <asm/processor-flags.h>
 
 ENTRY(swsusp_arch_suspend)
 	movq	$saved_context, %rax
@@ -60,7 +61,7 @@ ENTRY(restore_image)
 	/* Flush TLB */
 	movq	mmu_cr4_features(%rip), %rax
 	movq	%rax, %rdx
-	andq	$~(1<<7), %rdx	# PGE
+	andq	$~(X86_CR4_PGE), %rdx
 	movq	%rdx, %cr4;  # turn off PGE
 	movq	%cr3, %rcx;  # flush TLB
 	movq	%rcx, %cr3;
@@ -112,7 +113,7 @@ ENTRY(restore_registers)
 	/* Flush TLB, including "global" things (vmalloc) */
 	movq	mmu_cr4_features(%rip), %rax
 	movq	%rax, %rdx
-	andq	$~(1<<7), %rdx;  # PGE
+	andq	$~(X86_CR4_PGE), %rdx
 	movq	%rdx, %cr4;  # turn off PGE
 	movq	%cr3, %rcx;  # flush TLB
 	movq	%rcx, %cr3
#2 lore raw

[Ingo Molnar - Sun, Feb 17, 2008 at 07:17:16PM +0100]

| 
| * Cyrill Gorcunov <[email protected]> wrote:
| 
| > By including <asm/processor-flags.h> we're allowed to use X86_CR4_PGE 
| > instead of numeric constant.
| > 
| > md5 sums of compiled files are differ due to this inclusion but .text 
| > section remains the same.
| 
| thanks Cyrill, picked it up. (the merged version is below - the target 
| files moved meanwhile)
| 
| 	Ingo
| 

[...]

Thanks, Ingo

- Cyrill -