On Tue, Sep 22, 2015 at 06:50:42PM +0200, Christophe Leroy wrote:No I didn't, I though it was there for a reason, it has been there since 2005.
x_mapped_by_bats() and x_mapped_by_tlbcam() serve the same kind ofDid you forget to remove that comment?
purpose, so lets group them into a single function.
Signed-off-by: Christophe Leroy <christophe.leroy@xxxxxx>
---
No change in v2
arch/powerpc/mm/pgtable_32.c | 33 ++++++++++++++++++++++++++-------
1 file changed, 26 insertions(+), 7 deletions(-)
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
index 03a073a..3fd9083 100644
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
@@ -67,6 +67,28 @@ extern unsigned long p_mapped_by_tlbcam(phys_addr_t pa);
#define p_mapped_by_tlbcam(x) (0UL)
#endif /* HAVE_TLBCAM */
+static inline unsigned long p_mapped_by_other(phys_addr_t pa)
+{
+ unsigned long v;
+
+ v = p_mapped_by_bats(pa);
+ if (v /*&& p_mapped_by_bats(p+size-1)*/)
+ return v;
+
+ return p_mapped_by_tlbcam(pa);
+}