From dc85e798cdca665b3d20e4de16d7531e992118c6 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Tue, 7 Sep 2004 17:48:06 -0700 Subject: [PATCH] ppc64: fix declaration order in asm-ppc64/tlb.h In asm-ppc64/tlb.h, tlb_flush() is defined as inline after the #include of asm-generic/tlb.h which uses it, defeating the inline directive. gcc-3.4 exposes this problem, causing a compile failure. This patch reorders the file to fix the problem. Signed-off-by: David Gibson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- include/asm-ppc64/tlb.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/include/asm-ppc64/tlb.h b/include/asm-ppc64/tlb.h index 6fafb87dc951..97cb696ce68d 100644 --- a/include/asm-ppc64/tlb.h +++ b/include/asm-ppc64/tlb.h @@ -15,7 +15,14 @@ #include struct mmu_gather; -static inline void tlb_flush(struct mmu_gather *tlb); + +extern void pte_free_finish(void); + +static inline void tlb_flush(struct mmu_gather *tlb) +{ + flush_tlb_pending(); + pte_free_finish(); +} /* Avoid pulling in another include just for this */ #define check_pgt_cache() do { } while (0) @@ -29,12 +36,4 @@ static inline void tlb_flush(struct mmu_gather *tlb); #define __tlb_remove_tlb_entry(tlb, pte, address) do { } while (0) -extern void pte_free_finish(void); - -static inline void tlb_flush(struct mmu_gather *tlb) -{ - flush_tlb_pending(); - pte_free_finish(); -} - #endif /* _PPC64_TLB_H */ -- cgit v1.2.3