diff --git a/[refs] b/[refs] index 25dc25c59e41..254c31df00ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 248fb89c12228190cecea553353e16cf21a67dc3 +refs/heads/master: bbb1e57a1c0b732cfeb727bed7c61e80a79c6479 diff --git a/trunk/arch/x86/power/hibernate_asm_64.S b/trunk/arch/x86/power/hibernate_asm_64.S index 1deb3244b99b..000415947d93 100644 --- a/trunk/arch/x86/power/hibernate_asm_64.S +++ b/trunk/arch/x86/power/hibernate_asm_64.S @@ -20,6 +20,7 @@ #include #include #include +#include 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