* 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
------------->
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.
Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
---
arch/x86/power/hibernate_asm_64.S | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Index: linux-x86.q/arch/x86/power/hibernate_asm_64.S
===================================================================
--- linux-x86.q.orig/arch/x86/power/hibernate_asm_64.S
+++ 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
