lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86, cleanup: use X86_CR4_PGE in x86/power/hibernate_asm_32.S

Browse Source 
Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Uros Bizjak
2008-08-20 10:44:47 +02:00
committed by Ingo Molnar
parent 7393423dd9
commit c171f465b7
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arch/x86/power/hibernate_asm_32.S
View File

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