x86 cleanup: suspend_asm_64.S - use X86_CR4_PGE instead of numeric value
authorCyrill Gorcunov <gorcunov@gmail.com>
Fri, 8 Feb 2008 21:49:13 +0000 (00:49 +0300)
committerIngo Molnar <mingo@elte.hu>
Tue, 19 Feb 2008 15:18:33 +0000 (16:18 +0100)
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>
arch/x86/power/hibernate_asm_64.S

index 1deb3244b99b766977565019790516ea98c48211..000415947d93590e3f3230371c1d81fa35d2b600 100644 (file)
@@ -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