From patchwork Thu Dec 6 06:44:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1008625 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 439R2s5c7Cz9s6w for ; Thu, 6 Dec 2018 17:46:29 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="jPpg2hkA"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 439R2s3xPhzDr7K for ; Thu, 6 Dec 2018 17:46:29 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="jPpg2hkA"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 439R0L27QczDqk7 for ; Thu, 6 Dec 2018 17:44:18 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="jPpg2hkA"; dkim-atps=neutral Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 439R0K4r5wz9s7W; Thu, 6 Dec 2018 17:44:17 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1544078657; bh=KA7wdu/XaKITc7uOXSgS2CDTxzM9KyNLWBBesTq2rmA=; h=Date:From:To:Cc:Subject:From; b=jPpg2hkAgjrzWiqHu7HWIN+recVRX9W16R3cjTWSitbUpaLWmtUZLyrg3tX2RjfCI KxJ+ik7kEnyUznt2xg9sVw62MMtST+1UR6DDK5biM6ohwnjAMbyfXsqCJr4irSeGh2 6W3XsIcEA5IObZ+ChG2poTtOZCQuluLWd5GHzfjt8SVFjak3CzKp4iJy+31W3kvJyw Wgl0vlQ7K7qH/0JfDPGIicU67eJAp53OiwR9HS0+wAjnnqaz0seZ2jClY5bZ/drPJs wrDrFk5zxFKSj3irNqS4JD2KfFNjj65p0U9TRVxgWe4Fv/ktQEFbaXuu37lULseNN9 5+IbMSJC4bNhA== Date: Thu, 6 Dec 2018 17:44:17 +1100 From: Stephen Rothwell To: Andrew Morton , Michael Ellerman , Benjamin Herrenschmidt , PowerPC Subject: linux-next: manual merge of the akpm-current tree with the powerpc tree Message-ID: <20181206174417.45fe3e7a@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Joel Fernandes \(Google\)" , Linux Next Mailing List , Linux Kernel Mailing List Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Hi Andrew, Today's linux-next merge of the akpm-current tree got conflicts in: arch/powerpc/include/asm/book3s/32/pgalloc.h arch/powerpc/include/asm/nohash/32/pgalloc.h arch/powerpc/mm/pgtable-book3s64.c between commits: a95d133c8643 ("powerpc/mm: Move pte_fragment_alloc() to a common location") 32ea4c149990 ("powerpc/mm: Extend pte_fragment functionality to PPC32") from the powerpc tree and commit: 913c2d755b39 ("mm: treewide: remove unused address argument from pte_alloc functions") from the akpm-current tree. I fixed it up (see below, plus the extra merge fix patch) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. From: Stephen Rothwell Date: Thu, 6 Dec 2018 17:41:27 +1100 Subject: [PATCH] fix up for "mm: treewide: remove unused address argument from pte_alloc functions" Signed-off-by: Stephen Rothwell Reviewed-by: Joel Fernandes (Google) --- arch/powerpc/mm/pgtable-frag.c | 2 +- arch/powerpc/mm/pgtable_32.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/mm/pgtable-frag.c b/arch/powerpc/mm/pgtable-frag.c index af23a587f019..a7b05214760c 100644 --- a/arch/powerpc/mm/pgtable-frag.c +++ b/arch/powerpc/mm/pgtable-frag.c @@ -95,7 +95,7 @@ static pte_t *__alloc_for_ptecache(struct mm_struct *mm, int kernel) return (pte_t *)ret; } -pte_t *pte_fragment_alloc(struct mm_struct *mm, unsigned long vmaddr, int kernel) +pte_t *pte_fragment_alloc(struct mm_struct *mm, int kernel) { pte_t *pte; diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c index deda68e02338..5b1e1adeb4d2 100644 --- a/arch/powerpc/mm/pgtable_32.c +++ b/arch/powerpc/mm/pgtable_32.c @@ -48,12 +48,12 @@ __ref pte_t *pte_alloc_one_kernel(struct mm_struct *mm) if (!slab_is_available()) return memblock_alloc(PTE_FRAG_SIZE, PTE_FRAG_SIZE); - return (pte_t *)pte_fragment_alloc(mm, address, 1); + return (pte_t *)pte_fragment_alloc(mm, 1); } pgtable_t pte_alloc_one(struct mm_struct *mm) { - return (pgtable_t)pte_fragment_alloc(mm, address, 0); + return (pgtable_t)pte_fragment_alloc(mm, 0); } void __iomem *