Commit:     d4243c175f127b377c881f512e7fb8ddaf2ed5e2
Parent:     048c8bc90e53bf1f5feec020a7d482da94894e93
Author:     Mathieu Desnoyers <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 2 13:30:04 2007 -0700
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Wed Oct 3 12:02:43 2007 +1000

    [POWERPC] Include pagemap.h in asm/powerpc/tlb.h
    Fixes this powerpc build error in 2.6.22-rc6-mm1 for powerpc 64 with
    In file included from include2/asm/tlb.h:60,
    /home/compudj/git/linux-2.6-lttng/include/asm-generic/tlb.h: In function 
    /home/compudj/git/linux-2.6-lttng/include/asm-generic/tlb.h:76: error: 
implicit declaration of function 'release_pages'
    /home/compudj/git/linux-2.6-lttng/include/asm-generic/tlb.h: In function 
    /home/compudj/git/linux-2.6-lttng/include/asm-generic/tlb.h:105: error: 
implicit declaration of function 'page_cache_release'
    make[2]: *** [arch/powerpc/mm/init_64.o] Error 1
    release_pages is declared in linux/pagemap.h, but cannot be included in
    linux/swap.h because of a sparc related comment:
    /* only sparc can not include linux/pagemap.h in this file
     * so leave page_cache_release and release_pages undeclared... */
    #define free_page_and_swap_cache(page) \
    #define free_pages_and_swap_cache(pages, nr) \
            release_pages((pages), (nr), 0);
    Signed-off-by: Mathieu Desnoyers <[EMAIL PROTECTED]>
    Cc: Benjamin Herrenschmidt <[EMAIL PROTECTED]>
    Cc: Kumar Gala <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
 include/asm-powerpc/tlb.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/include/asm-powerpc/tlb.h b/include/asm-powerpc/tlb.h
index 6671404..e20ff75 100644
--- a/include/asm-powerpc/tlb.h
+++ b/include/asm-powerpc/tlb.h
@@ -23,6 +23,8 @@
 #include <asm/mmu.h>
+#include <linux/pagemap.h>
 struct mmu_gather;
 #define tlb_start_vma(tlb, vma)        do { } while (0)
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to