Re: swsusp_restore crap

[Pavel Machek <pavel@ucw.cz>]

Hi!

> > > > x86-64 needs this, too.... Otherwise it looks okay.
> > > 
> > > It breaks compilation on i386 either, because nr_copy_pages_check
> > > is static in swsusp.c.  May I propose the following patch instead (tested on
> > > x86-64 and i386)?
> > 
> > 
> > > +asmlinkage int __swsusp_flush_tlb(void)
> > > +{
> > > +	swsusp_restore_check();
> > 
> > Someone will certainly forget this one, and it is probably
> > nicer/easier to just move BUG_ON into swsusp_suspend(), just after
> > restore_processor_state() or something like that...
> 
> ... in which case __swsusp_flush_tlb() would only contain a "call" to
> __flush_tlb_global(), but this is a macro on both x86-64 and i386, so we can
> drop the __swsusp_flush_tlb() altogether and do it in assembly (before the
> GPRs are restored, perhaps).  Patch follows.
> 
> Greets,
> Rafael
> 
> 
> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

> diff -Nrup linux-2.6.11-bk10-a/arch/x86_64/kernel/suspend_asm.S linux-2.6.11-bk10-b/arch/x86_64/kernel/suspend_asm.S
> --- linux-2.6.11-bk10-a/arch/x86_64/kernel/suspend_asm.S	2005-03-15 09:20:53.000000000 +0100
> +++ linux-2.6.11-bk10-b/arch/x86_64/kernel/suspend_asm.S	2005-03-15 15:36:29.000000000 +0100
> @@ -69,6 +69,14 @@ loop:
>  	movq	pbe_next(%rdx), %rdx
>  	jmp	loop
>  done:
> +	/* Flush TLB, including "global" things (vmalloc) */
> +	movq	%rax, %rdx;  # mmu_cr4_features(%rip)

I somehow don't think %rax contains mmu_cr4_features at this
point. Otherwise it seems to look ok.
								Pavel

-- 
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!