Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp2140067yba; Sun, 5 May 2019 23:49:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqyCfPokf/qoZsKoI4iyEPqrVAD39yLhGT2Z7CCvAC9fAh9EE6favLfNEdvXHYAoTIKlFG8T X-Received: by 2002:a17:902:8e8b:: with SMTP id bg11mr31122051plb.281.1557125346376; Sun, 05 May 2019 23:49:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557125346; cv=none; d=google.com; s=arc-20160816; b=o2rViMBHMMl+Xb5rLcqycEJFxZesrHKPODISC1ApI0OlUZ/wZsf1atIuT4J2nhvZM/ cr//XCjvJR9YqKy4uxPJVdOxqMYLrXErVLa8EFu9gQAiijXjRgf6Icd2yx0/RC6msh8F hR3pLG8PjP31YBfdCQ07DngVr2nFt5XwZspsQiLT1CGztF6YJlEGseecKDeJMjEu+o7i 9+HwKS8I/lNBRyZTtujyWke90/5zFQ7GUm6SqhzUZwAx48T3P4I/VH85PmcpdC5w35Nl LnuEJ/cWbEvv0iEGTC6nKezWhYtsN+lb/yhOxN8SZ4Tx6TyxbL12eZVeQErpXMTsfs+R uqfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:message-id :dkim-signature; bh=igwDhWLswk58Ekrh/smeT3jyFCd7faNWM1HhbOhpVEU=; b=AdpqzltpVbD+HlYXbKzuuI8cpZgpZN3DYyj/kuHCMQRS2UxIiHgT6+IrZYRbG6NQLi j67jRJNc3201VHpIWBHJE3Nf8YynMjupHKNtO4qBtCQRh/evQ8RNmZwxv0xOIRxAC8/s yujrgEKAxG08P1sK8wrZogB/xt2N9pI1ykFL/OSBezlPW8nJ0QazvFCqBtqYjQ30v9hp 78zuMP3BM23SBHspkgKh6Ec6F5GnRcmupcmmPJylYfYa9lW0iQG+MxMqjQJXNj0FdT+E 4RynAY21uE+P0ovXQBibAAojkbud5Mlqn+b/VSXadbbNlMxAwy6PSIGl+xDFjM28PcLr cTUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=ehWHs0Fv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z186si6882561pgd.126.2019.05.05.23.48.50; Sun, 05 May 2019 23:49:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=ehWHs0Fv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726046AbfEFGr6 (ORCPT + 99 others); Mon, 6 May 2019 02:47:58 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:6640 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725813AbfEFGr5 (ORCPT ); Mon, 6 May 2019 02:47:57 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 44yCwl3zzfz9tyfk; Mon, 6 May 2019 08:47:51 +0200 (CEST) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=ehWHs0Fv; dkim-adsp=pass; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id L6RKIRyhBNiy; Mon, 6 May 2019 08:47:51 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 44yCwl2w1gz9tyfj; Mon, 6 May 2019 08:47:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1557125271; bh=igwDhWLswk58Ekrh/smeT3jyFCd7faNWM1HhbOhpVEU=; h=From:Subject:To:Cc:Date:From; b=ehWHs0Fv4Nt5isF2Jzpfy9wn0WCyCmMMkP7UK4T+/hT1wRMz9s1jOD9OH+fFzN1GF ATdDRQmWTPGYLoBknw/ehsGHlhCm0ELguMd6WlRocytOZDslw9YXl3Sd560xhSTwHs bE3vUQLem7bS0y5PqopTtkoDbIGIFaNuZYrPTpMQ= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id D50678B824; Mon, 6 May 2019 08:47:55 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id Q5XfMSvK9bY9; Mon, 6 May 2019 08:47:55 +0200 (CEST) Received: from po16846vm.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr [172.25.231.6]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 9E78E8B74F; Mon, 6 May 2019 08:47:55 +0200 (CEST) Received: by po16846vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 9D7716728F; Mon, 6 May 2019 06:47:55 +0000 (UTC) Message-Id: From: Christophe Leroy Subject: [PATCH] powerpc/mm: fix redundant inclusion of pgtable-frag.o in Makefile To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Mon, 6 May 2019 06:47:55 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The patch identified below added pgtable-frag.o to obj-y but some merge witchery kept it also for obj-CONFIG_PPC_BOOK3S_64 This patch clears the duplication. Fixes: 737b434d3d55 ("powerpc/mm: convert Book3E 64 to pte_fragment") Signed-off-by: Christophe Leroy --- arch/powerpc/mm/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/powerpc/mm/Makefile b/arch/powerpc/mm/Makefile index 7a7527116c3a..0f499db315d6 100644 --- a/arch/powerpc/mm/Makefile +++ b/arch/powerpc/mm/Makefile @@ -12,7 +12,6 @@ obj-y := fault.o mem.o pgtable.o mmap.o \ obj-$(CONFIG_PPC_MMU_NOHASH) += nohash/ obj-$(CONFIG_PPC_BOOK3S_32) += book3s32/ obj-$(CONFIG_PPC_BOOK3S_64) += book3s64/ -obj-$(CONFIG_PPC_BOOK3S_64) += pgtable-frag.o obj-$(CONFIG_NEED_MULTIPLE_NODES) += numa.o obj-$(CONFIG_PPC_MM_SLICES) += slice.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o -- 2.13.3