Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752413AbZG1ASL (ORCPT ); Mon, 27 Jul 2009 20:18:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752216AbZG1ASK (ORCPT ); Mon, 27 Jul 2009 20:18:10 -0400 Received: from gate.crashing.org ([63.228.1.57]:43419 "EHLO gate.crashing.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751597AbZG1ASJ (ORCPT ); Mon, 27 Jul 2009 20:18:09 -0400 Subject: Re: [RFC/PATCH] mm: Pass virtual address to [__]p{te,ud,md}_free_tlb() From: Benjamin Herrenschmidt To: Linus Torvalds Cc: Nick Piggin , Linux Memory Management , Linux-Arch , linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org, Hugh Dickins , ralf , Paul Mundt In-Reply-To: References: <20090715074952.A36C7DDDB2@ozlabs.org> <20090715135620.GD7298@wotan.suse.de> <1248073873.13067.31.camel@pasglop> <1248310415.3367.22.camel@pasglop> Content-Type: text/plain Date: Tue, 28 Jul 2009 10:17:40 +1000 Message-Id: <1248740260.30993.26.camel@pasglop> Mime-Version: 1.0 X-Mailer: Evolution 2.26.1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3225 Lines: 91 On Mon, 2009-07-27 at 12:11 -0700, Linus Torvalds wrote: > > On Thu, 23 Jul 2009, Benjamin Herrenschmidt wrote: > > > > Hrm... my powerpc-next branch will contain stuff that depend on it, so > > I'll probably have to pull it in though, unless I tell all my > > sub-maintainers to also pull from that other branch first :-) > > Ok, I'll just apply the patch. It does look obvious enough. There seem to be a MIPS and SH breakage as a result but I can't see how my patch would have broken it, ie, it looks like the bug was already in those two archs. The error is that it complains about a duplicate definition of __pmd_free_tlb() between those arch pgalloc.h and pgtable-nopmd.h For MIPS, when CONFIG_32BIT is set, asm/pgalloc.h redefines __pmd_free_tlb despite the fact that it's already defined by asm-generic/pgtable-nopmd.h (via via pgtable.h via linux/mm.h). I -suspect- what happens is that the compiler, before, would ignore the double definition (or maybe just warn) due to the definition being strictly identical. With the new argument added, it's no longer the case as it's called "a" in asm-generic and "addr" in mips... oops. In any case, can Ralf and Paul check if the following patch is correct ? >From 41928c7945d855ae0eb053eadad590ab6876847e Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Tue, 28 Jul 2009 10:16:48 +1000 Subject: [PATCH] mm: Remove duplicate definitions in MIPS and SH Those definitions are already provided by asm-generic Signed-off-by: Benjamin Herrenschmidt --- arch/mips/include/asm/pgalloc.h | 11 ----------- arch/sh/include/asm/pgalloc.h | 8 -------- 2 files changed, 0 insertions(+), 19 deletions(-) diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h index f705735..3738f4b 100644 --- a/arch/mips/include/asm/pgalloc.h +++ b/arch/mips/include/asm/pgalloc.h @@ -104,17 +104,6 @@ do { \ tlb_remove_page((tlb), pte); \ } while (0) -#ifdef CONFIG_32BIT - -/* - * allocating and freeing a pmd is trivial: the 1-entry pmd is - * inside the pgd, so has no extra memory associated with it. - */ -#define pmd_free(mm, x) do { } while (0) -#define __pmd_free_tlb(tlb, x, addr) do { } while (0) - -#endif - #ifdef CONFIG_64BIT static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address) diff --git a/arch/sh/include/asm/pgalloc.h b/arch/sh/include/asm/pgalloc.h index 89a4827..63ca37b 100644 --- a/arch/sh/include/asm/pgalloc.h +++ b/arch/sh/include/asm/pgalloc.h @@ -79,14 +79,6 @@ do { \ tlb_remove_page((tlb), (pte)); \ } while (0) -/* - * allocating and freeing a pmd is trivial: the 1-entry pmd is - * inside the pgd, so has no extra memory associated with it. - */ - -#define pmd_free(mm, x) do { } while (0) -#define __pmd_free_tlb(tlb,x,addr) do { } while (0) - static inline void check_pgt_cache(void) { quicklist_trim(QUICK_PGD, NULL, 25, 16); -- 1.6.1.2.14.gf26b5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/