Re: [PATCH] x86: Use X86_CR4_PGE in x86/power/hibernate_asm_32.S

[Rafael J. Wysocki]

On Wednesday, 20 of August 2008, Ingo Molnar wrote:
> 
> * Uros Bizjak <ubizjak@xxxxxxxxx> wrote:
> 
> > Signed-off-by: Uros Bizjak <ubizjak@xxxxxxxxx>
> 
> applied the commit below to tip/x86/cleanups - thanks Uros.
> 
> i did a small change: i moved the .text to after the include files. 
> While include files are not supposed to change section attributes, it 
> looks logically more consistent to have the .text right before the code.
> 
> 	Ingo
> 
> ----------------->
> From c171f465b7281f2d3b03e9145ec763d6a8bab176 Mon Sep 17 00:00:00 2001
> From: Uros Bizjak <ubizjak@xxxxxxxxx>
> Date: Wed, 20 Aug 2008 10:44:47 +0200
> Subject: [PATCH] x86, cleanup: use X86_CR4_PGE in x86/power/hibernate_asm_32.S
> 
> Signed-off-by: Uros Bizjak <ubizjak@xxxxxxxxx>
> Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

Acked-by: Rafael J. Wysocki <rjw@xxxxxxx>

> ---
>  arch/x86/power/hibernate_asm_32.S |   14 +++++++-------
>  1 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/x86/power/hibernate_asm_32.S b/arch/x86/power/hibernate_asm_32.S
> index 4fc7e87..d1e9b53 100644
> --- a/arch/x86/power/hibernate_asm_32.S
> +++ b/arch/x86/power/hibernate_asm_32.S
> @@ -1,5 +1,3 @@
> -.text
> -
>  /*
>   * This may not use any stack, nor any variable that is not "NoSave":
>   *
> @@ -12,17 +10,18 @@
>  #include <asm/segment.h>
>  #include <asm/page.h>
>  #include <asm/asm-offsets.h>
> +#include <asm/processor-flags.h>
>  
> -	.text
> +.text
>  
>  ENTRY(swsusp_arch_suspend)
> -
>  	movl %esp, saved_context_esp
>  	movl %ebx, saved_context_ebx
>  	movl %ebp, saved_context_ebp
>  	movl %esi, saved_context_esi
>  	movl %edi, saved_context_edi
> -	pushfl ; popl saved_context_eflags
> +	pushfl
> +	popl saved_context_eflags
>  
>  	call swsusp_save
>  	ret
> @@ -59,7 +58,7 @@ done:
>  	movl	mmu_cr4_features, %ecx
>  	jecxz	1f	# cr4 Pentium and higher, skip if zero
>  	movl	%ecx, %edx
> -	andl	$~(1<<7), %edx;  # PGE
> +	andl	$~(X86_CR4_PGE), %edx
>  	movl	%edx, %cr4;  # turn off PGE
>  1:
>  	movl	%cr3, %eax;  # flush TLB
> @@ -74,7 +73,8 @@ done:
>  	movl saved_context_esi, %esi
>  	movl saved_context_edi, %edi
>  
> -	pushl saved_context_eflags ; popfl
> +	pushl saved_context_eflags
> +	popfl
>  
>  	xorl	%eax, %eax
>  
> 
> 


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/