Commit bbb1e57a authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar

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: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 248fb89c
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <asm/segment.h> #include <asm/segment.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/processor-flags.h>
ENTRY(swsusp_arch_suspend) ENTRY(swsusp_arch_suspend)
movq $saved_context, %rax movq $saved_context, %rax
...@@ -60,7 +61,7 @@ ENTRY(restore_image) ...@@ -60,7 +61,7 @@ ENTRY(restore_image)
/* Flush TLB */ /* Flush TLB */
movq mmu_cr4_features(%rip), %rax movq mmu_cr4_features(%rip), %rax
movq %rax, %rdx movq %rax, %rdx
andq $~(1<<7), %rdx # PGE andq $~(X86_CR4_PGE), %rdx
movq %rdx, %cr4; # turn off PGE movq %rdx, %cr4; # turn off PGE
movq %cr3, %rcx; # flush TLB movq %cr3, %rcx; # flush TLB
movq %rcx, %cr3; movq %rcx, %cr3;
...@@ -112,7 +113,7 @@ ENTRY(restore_registers) ...@@ -112,7 +113,7 @@ ENTRY(restore_registers)
/* Flush TLB, including "global" things (vmalloc) */ /* Flush TLB, including "global" things (vmalloc) */
movq mmu_cr4_features(%rip), %rax movq mmu_cr4_features(%rip), %rax
movq %rax, %rdx movq %rax, %rdx
andq $~(1<<7), %rdx; # PGE andq $~(X86_CR4_PGE), %rdx
movq %rdx, %cr4; # turn off PGE movq %rdx, %cr4; # turn off PGE
movq %cr3, %rcx; # flush TLB movq %cr3, %rcx; # flush TLB
movq %rcx, %cr3 movq %rcx, %cr3
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment