From: Pavel Machek This kills swsusp_resume; it should be arch-neutral but some i386 code sneaked in. And arch-specific code is better done in assembly anyway. Plus it fixes memory leaks in error paths. Signed-off-by: Rafael J. Wysocki Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton --- 25-akpm/arch/i386/power/swsusp.S | 13 ++++++++++++- 25-akpm/arch/x86_64/kernel/suspend_asm.S | 15 +++++++++++++-- 25-akpm/kernel/power/swsusp.c | 16 +++++----------- 3 files changed, 30 insertions(+), 14 deletions(-) diff -puN arch/i386/power/swsusp.S~swsusp-1-1-kill-swsusp_restore arch/i386/power/swsusp.S --- 25/arch/i386/power/swsusp.S~swsusp-1-1-kill-swsusp_restore 2005-03-20 16:13:40.000000000 -0800 +++ 25-akpm/arch/i386/power/swsusp.S 2005-03-20 16:13:40.000000000 -0800 @@ -51,6 +51,15 @@ copy_loop: .p2align 4,,7 done: + /* Flush TLB, including "global" things (vmalloc) */ + movl mmu_cr4_features, %eax + movl %eax, %edx + andl $~(1<<7), %edx; # PGE + movl %edx, %cr4; # turn off PGE + movl %cr3, %ecx; # flush TLB + movl %ecx, %cr3 + movl %eax, %cr4; # turn PGE back on + movl saved_context_esp, %esp movl saved_context_ebp, %ebp movl saved_context_ebx, %ebx @@ -58,5 +67,7 @@ done: movl saved_context_edi, %edi pushl saved_context_eflags ; popfl - call swsusp_restore + + xorl %eax, %eax + ret diff -puN arch/x86_64/kernel/suspend_asm.S~swsusp-1-1-kill-swsusp_restore arch/x86_64/kernel/suspend_asm.S --- 25/arch/x86_64/kernel/suspend_asm.S~swsusp-1-1-kill-swsusp_restore 2005-03-20 16:13:40.000000000 -0800 +++ 25-akpm/arch/x86_64/kernel/suspend_asm.S 2005-03-20 16:13:40.000000000 -0800 @@ -69,12 +69,21 @@ loop: movq pbe_next(%rdx), %rdx jmp loop done: + /* Flush TLB, including "global" things (vmalloc) */ + movq mmu_cr4_features(%rip), %rax + movq %rax, %rdx + andq $~(1<<7), %rdx; # PGE + movq %rdx, %cr4; # turn off PGE + movq %cr3, %rcx; # flush TLB + movq %rcx, %cr3 + movq %rax, %cr4; # turn PGE back on + movl $24, %eax movl %eax, %ds movq saved_context_esp(%rip), %rsp movq saved_context_ebp(%rip), %rbp - movq saved_context_eax(%rip), %rax + /* Don't restore %rax, it must be 0 anyway */ movq saved_context_ebx(%rip), %rbx movq saved_context_ecx(%rip), %rcx movq saved_context_edx(%rip), %rdx @@ -89,5 +98,7 @@ done: movq saved_context_r14(%rip), %r14 movq saved_context_r15(%rip), %r15 pushq saved_context_eflags(%rip) ; popfq - call swsusp_restore + + xorq %rax, %rax + ret diff -puN kernel/power/swsusp.c~swsusp-1-1-kill-swsusp_restore kernel/power/swsusp.c --- 25/kernel/power/swsusp.c~swsusp-1-1-kill-swsusp_restore 2005-03-20 16:13:40.000000000 -0800 +++ 25-akpm/kernel/power/swsusp.c 2005-03-20 16:13:40.000000000 -0800 @@ -892,29 +892,23 @@ int swsusp_suspend(void) * at resume time, and evil weirdness ensues. */ if ((error = device_power_down(PMSG_FREEZE))) { + printk(KERN_ERR "Some devices failed to power down, aborting suspend\n"); local_irq_enable(); + swsusp_free(); return error; } save_processor_state(); - error = swsusp_arch_suspend(); + if ((error = swsusp_arch_suspend())) + swsusp_free(); /* Restore control flow magically appears here */ restore_processor_state(); + BUG_ON (nr_copy_pages_check != nr_copy_pages); restore_highmem(); device_power_up(); local_irq_enable(); return error; } - -asmlinkage int swsusp_restore(void) -{ - BUG_ON (nr_copy_pages_check != nr_copy_pages); - - /* Even mappings of "global" things (vmalloc) need to be fixed */ - __flush_tlb_global(); - return 0; -} - int swsusp_resume(void) { int error; _