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. --- If anyone has an objection on this patch - just drop it please. I'm not sure but this could have a side effect in case of future <asm/processor-flags.h> modifications so it would require __ASSEMBLY__ preprocessor directive. Index: linux-2.6.git/arch/x86/kernel/suspend_asm_64.S =================================================================== --- linux-2.6.git.orig/arch/x86/kernel/suspend_asm_64.S 2008-02-09 00:28:45.000000000 +0300 +++ linux-2.6.git/arch/x86/kernel/suspend_asm_64.S 2008-02-09 00:28:48.000000000 +0300 @@ -9,12 +9,13 @@ * image could very well be data page in "new" image, and overwriting * your own stack under you is bad idea. */ - + .text #include <linux/linkage.h> #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 @@ -55,7 +56,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; @@ -107,7 +108,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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/