diff options
| author | Cyrill Gorcunov <gorcunov@gmail.com> | 2008-02-08 16:49:13 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-02-19 10:18:33 -0500 |
| commit | bbb1e57a1c0b732cfeb727bed7c61e80a79c6479 (patch) | |
| tree | dde90cec9c91fbfa430de90ef55d8dadef8d33c5 | |
| parent | 248fb89c12228190cecea553353e16cf21a67dc3 (diff) | |
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>
| -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 1deb3244b99b..000415947d93 100644 --- a/arch/x86/power/hibernate_asm_64.S +++ b/arch/x86/power/hibernate_asm_64.S | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <asm/segment.h> | 20 | #include <asm/segment.h> |
| 21 | #include <asm/page.h> | 21 | #include <asm/page.h> |
| 22 | #include <asm/asm-offsets.h> | 22 | #include <asm/asm-offsets.h> |
| 23 | #include <asm/processor-flags.h> | ||
| 23 | 24 | ||
| 24 | ENTRY(swsusp_arch_suspend) | 25 | ENTRY(swsusp_arch_suspend) |
| 25 | movq $saved_context, %rax | 26 | movq $saved_context, %rax |
| @@ -60,7 +61,7 @@ ENTRY(restore_image) | |||
| 60 | /* Flush TLB */ | 61 | /* Flush TLB */ |
| 61 | movq mmu_cr4_features(%rip), %rax | 62 | movq mmu_cr4_features(%rip), %rax |
| 62 | movq %rax, %rdx | 63 | movq %rax, %rdx |
| 63 | andq $~(1<<7), %rdx # PGE | 64 | andq $~(X86_CR4_PGE), %rdx |
| 64 | movq %rdx, %cr4; # turn off PGE | 65 | movq %rdx, %cr4; # turn off PGE |
| 65 | movq %cr3, %rcx; # flush TLB | 66 | movq %cr3, %rcx; # flush TLB |
| 66 | movq %rcx, %cr3; | 67 | movq %rcx, %cr3; |
| @@ -112,7 +113,7 @@ ENTRY(restore_registers) | |||
| 112 | /* Flush TLB, including "global" things (vmalloc) */ | 113 | /* Flush TLB, including "global" things (vmalloc) */ |
| 113 | movq mmu_cr4_features(%rip), %rax | 114 | movq mmu_cr4_features(%rip), %rax |
| 114 | movq %rax, %rdx | 115 | movq %rax, %rdx |
| 115 | andq $~(1<<7), %rdx; # PGE | 116 | andq $~(X86_CR4_PGE), %rdx |
| 116 | movq %rdx, %cr4; # turn off PGE | 117 | movq %rdx, %cr4; # turn off PGE |
| 117 | movq %cr3, %rcx; # flush TLB | 118 | movq %cr3, %rcx; # flush TLB |
| 118 | movq %rcx, %cr3 | 119 | movq %rcx, %cr3 |
