lkml.org 
[lkml]   [2008]   [Mar]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 05 of 31] x86: put paravirt stubs into common asm/pgalloc.h
    Date
    From
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    ---
    arch/x86/mm/pageattr.c | 2 --
    include/asm-x86/pgalloc.h | 10 ++++++++++
    include/asm-x86/pgalloc_32.h | 10 ----------
    3 files changed, 10 insertions(+), 12 deletions(-)

    diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
    --- a/arch/x86/mm/pageattr.c
    +++ b/arch/x86/mm/pageattr.c
    @@ -479,9 +479,7 @@
    goto out_unlock;

    pbase = (pte_t *)page_address(base);
    -#ifdef CONFIG_X86_32
    paravirt_alloc_pt(&init_mm, page_to_pfn(base));
    -#endif
    ref_prot = pte_pgprot(pte_clrhuge(*kpte));

    #ifdef CONFIG_X86_64
    diff --git a/include/asm-x86/pgalloc.h b/include/asm-x86/pgalloc.h
    --- a/include/asm-x86/pgalloc.h
    +++ b/include/asm-x86/pgalloc.h
    @@ -4,6 +4,16 @@
    #include <linux/threads.h>
    #include <linux/mm.h> /* for struct page */
    #include <linux/pagemap.h>
    +
    +#ifdef CONFIG_PARAVIRT
    +#include <asm/paravirt.h>
    +#else
    +#define paravirt_alloc_pt(mm, pfn) do { } while (0)
    +#define paravirt_alloc_pd(mm, pfn) do { } while (0)
    +#define paravirt_alloc_pd_clone(pfn, clonepfn, start, count) do { } while (0)
    +#define paravirt_release_pt(pfn) do { } while (0)
    +#define paravirt_release_pd(pfn) do { } while (0)
    +#endif

    /*
    * Allocate and free page tables.
    diff --git a/include/asm-x86/pgalloc_32.h b/include/asm-x86/pgalloc_32.h
    --- a/include/asm-x86/pgalloc_32.h
    +++ b/include/asm-x86/pgalloc_32.h
    @@ -1,15 +1,5 @@
    #ifndef _I386_PGALLOC_H
    #define _I386_PGALLOC_H
    -
    -#ifdef CONFIG_PARAVIRT
    -#include <asm/paravirt.h>
    -#else
    -#define paravirt_alloc_pt(mm, pfn) do { } while (0)
    -#define paravirt_alloc_pd(mm, pfn) do { } while (0)
    -#define paravirt_alloc_pd_clone(pfn, clonepfn, start, count) do { } while (0)
    -#define paravirt_release_pt(pfn) do { } while (0)
    -#define paravirt_release_pd(pfn) do { } while (0)
    -#endif

    static inline void pmd_populate_kernel(struct mm_struct *mm,
    pmd_t *pmd, pte_t *pte)



    \
     
     \ /
      Last update: 2008-03-18 06:29    [W:4.489 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site