diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /arch/i386/power/swsusp.S | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'arch/i386/power/swsusp.S')
| -rw-r--r-- | arch/i386/power/swsusp.S | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/i386/power/swsusp.S b/arch/i386/power/swsusp.S index 8a2b50a0aaad..53662e05b393 100644 --- a/arch/i386/power/swsusp.S +++ b/arch/i386/power/swsusp.S | |||
| @@ -28,8 +28,9 @@ ENTRY(swsusp_arch_suspend) | |||
| 28 | call swsusp_save | 28 | call swsusp_save |
| 29 | ret | 29 | ret |
| 30 | 30 | ||
| 31 | ENTRY(swsusp_arch_resume) | 31 | ENTRY(restore_image) |
| 32 | movl $swsusp_pg_dir-__PAGE_OFFSET, %ecx | 32 | movl resume_pg_dir, %ecx |
| 33 | subl $__PAGE_OFFSET, %ecx | ||
| 33 | movl %ecx, %cr3 | 34 | movl %ecx, %cr3 |
| 34 | 35 | ||
| 35 | movl restore_pblist, %edx | 36 | movl restore_pblist, %edx |
| @@ -51,6 +52,10 @@ copy_loop: | |||
| 51 | .p2align 4,,7 | 52 | .p2align 4,,7 |
| 52 | 53 | ||
| 53 | done: | 54 | done: |
| 55 | /* go back to the original page tables */ | ||
| 56 | movl $swapper_pg_dir, %ecx | ||
| 57 | subl $__PAGE_OFFSET, %ecx | ||
| 58 | movl %ecx, %cr3 | ||
| 54 | /* Flush TLB, including "global" things (vmalloc) */ | 59 | /* Flush TLB, including "global" things (vmalloc) */ |
| 55 | movl mmu_cr4_features, %eax | 60 | movl mmu_cr4_features, %eax |
| 56 | movl %eax, %edx | 61 | movl %eax, %edx |