Re: [git pull] x86 arch updates for v2.6.25

[Jeremy Fitzhardinge <jeremy@goop.org>]

Ingo Molnar wrote:
> * Adrian Bunk <bunk@stusta.de> wrote:
>
>   
>>>> What about the breakages caused by commit 
>>>> a5a19c63f4e55e32dc0bc3d936d7f94793d8b380 (this commit broke the 
>>>> defconfig compilation on at least avr32, blackfin, sh, sparc and uml)?
>>>>         
>>> the patch below fixes that.
>>>       
>> Is it safe, or why did Jeremy state in the commit
>> "I removed this include to avoid an include cycle"?
>>     
>
> that is an x86.git complication alone, and only affects 32-bit PAE: it 
> is solved by the uninlining patch (that i've queued up to before the 
> asm-generic/tlb.h revert/fix).
>
> 	Ingo
>
> ------------->
> Subject: x86: uninline __pte_free_tlb() and __pmd_free_tlb()
> From: Ingo Molnar <mingo@elte.hu>
>
> this also removes an include file dependency.
>   

Yes, that simplifies things a lot.

    J
> Signed-off-by: Ingo Molnar <mingo@elte.hu>
> ---
>  arch/x86/mm/pgtable_32.c     |   19 +++++++++++++++++++
>  include/asm-x86/pgalloc_32.h |   19 ++-----------------
>  2 files changed, 21 insertions(+), 17 deletions(-)
>
> Index: linux/arch/x86/mm/pgtable_32.c
> ===================================================================
> --- linux.orig/arch/x86/mm/pgtable_32.c
> +++ linux/arch/x86/mm/pgtable_32.c
> @@ -376,3 +376,22 @@ void check_pgt_cache(void)
>  {
>  	quicklist_trim(0, pgd_dtor, 25, 16);
>  }
> +
> +void __pte_free_tlb(struct mmu_gather *tlb, struct page *pte)
> +{
> +	paravirt_release_pt(page_to_pfn(pte));
> +	tlb_remove_page(tlb, pte);
> +}
> +
> +void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd)
> +{
> +	/* This is called just after the pmd has been detached from
> +	   the pgd, which requires a full tlb flush to be recognized
> +	   by the CPU.  Rather than incurring multiple tlb flushes
> +	   while the address space is being pulled down, make the tlb
> +	   gathering machinery do a full flush when we're done. */
> +	tlb->fullmm = 1;
> +
> +	paravirt_release_pd(__pa(pmd) >> PAGE_SHIFT);
> +	tlb_remove_page(tlb, virt_to_page(pmd));
> +}
> Index: linux/include/asm-x86/pgalloc_32.h
> ===================================================================
> --- linux.orig/include/asm-x86/pgalloc_32.h
> +++ linux/include/asm-x86/pgalloc_32.h
> @@ -51,11 +51,7 @@ static inline void pte_free(struct page 
>  }
>  
>  
> -static inline void __pte_free_tlb(struct mmu_gather *tlb, struct page *pte)
> -{
> -	paravirt_release_pt(page_to_pfn(pte));
> -	tlb_remove_page(tlb, pte);
> -}
> +extern void __pte_free_tlb(struct mmu_gather *tlb, struct page *pte);
>  
>  #ifdef CONFIG_X86_PAE
>  /*
> @@ -72,18 +68,7 @@ static inline void pmd_free(pmd_t *pmd)
>  	free_page((unsigned long)pmd);
>  }
>  
> -static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd)
> -{
> -	/* This is called just after the pmd has been detached from
> -	   the pgd, which requires a full tlb flush to be recognized
> -	   by the CPU.  Rather than incurring multiple tlb flushes
> -	   while the address space is being pulled down, make the tlb
> -	   gathering machinery do a full flush when we're done. */
> -	tlb->fullmm = 1;
> -
> -	paravirt_release_pd(__pa(pmd) >> PAGE_SHIFT);
> -	tlb_remove_page(tlb, virt_to_page(pmd));
> -}
> +extern void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd);
>  
>  static inline void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
>  {
>