diff options
author | Cyrill Gorcunov <gorcunov@gmail.com> | 2008-02-09 00:49:13 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-02-19 16:18:33 +0100 |
commit | bbb1e57a1c0b732cfeb727bed7c61e80a79c6479 (patch) | |
tree | dde90cec9c91fbfa430de90ef55d8dadef8d33c5 /arch/x86/power | |
parent | 248fb89c12228190cecea553353e16cf21a67dc3 (diff) | |
download | op-kernel-dev-bbb1e57a1c0b732cfeb727bed7c61e80a79c6479.zip op-kernel-dev-bbb1e57a1c0b732cfeb727bed7c61e80a79c6479.tar.gz |
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.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/power')
-rw-r--r-- | arch/x86/power/hibernate_asm_64.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/power/hibernate_asm_64.S b/arch/x86/power/hibernate_asm_64.S index 1deb3244..0004159 100644 --- a/arch/x86/power/hibernate_asm_64.S +++ b/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 |