From patchwork Fri Oct 5 16:16:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10628455 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 07B8E1515 for ; Fri, 5 Oct 2018 16:23:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E96D229A14 for ; Fri, 5 Oct 2018 16:23:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DD73229A22; Fri, 5 Oct 2018 16:23:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BCF0D29A14 for ; Fri, 5 Oct 2018 16:23:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=rlhE61ULmGS1vjk45oAsRtSS+ULNUqbGc7mZ8PJ39jU=; b=iC9 ErwaOaBs9FDaALgwcX4LdSmGSYtCW+g2Jq1GfxbEtFZsO2AWM57pVk7A0uYkchvui/HYPlZMP5VQE ig68VnsZvh2ky2UPMlnFTkHiMruzDwAJKYDZpmNKF4u0vosq32F2CasCXTXwKrYwFxiMxWJ6remr/ QTxn6kvxFtABn0e++PO55mIWei9w+HZnQYYLINer4BgbE/cDsYE3RMyneFDqnPASNXtEy3adzFKEZ 8APEBiFgTBtSzgFQYOmd4BlIc5ISobM1kW/Q9JO8QGQa9MHtBTcvhq/hgXUZx03/XcfcGdz4s8xRg 6aJFf1mSg3WWx6C2XIgdOcyahcDy5UQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g8St5-0000cO-RN; Fri, 05 Oct 2018 16:23:35 +0000 Received: from mout.kundenserver.de ([217.72.192.75]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g8Ssn-0000am-Du for linux-arm-kernel@lists.infradead.org; Fri, 05 Oct 2018 16:23:33 +0000 Received: from wuerfel.lan ([109.193.40.16]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1MDy9C-1fyau30pYS-00A0Za; Fri, 05 Oct 2018 18:17:27 +0200 Received: from wuerfel.lan ([109.193.40.16]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1MDy9C-1fyau30pYS-00A0Za; Fri, 05 Oct 2018 18:17:27 +0200 From: Arnd Bergmann To: Andrew Morton Subject: [PATCH] hugetlb: fix ARM 3level page tables Date: Fri, 5 Oct 2018 18:16:58 +0200 Message-Id: <20181005161722.904274-1-arnd@arndb.de> X-Mailer: git-send-email 2.18.0 X-Provags-ID: V03:K1:+2XsToNchgBTSBUJPox6HDh12Rsb0+4Z6WR4YIKjJJG4wpv3DLO Wkjhcw1tpjUoRat94v9jQ3Ra7eEqJ2lmOPzvPGIvv7dSmH5lJHLGcVBFAQvh49SVk8j3W74 AsHOhPFA9ynRItVI4lNhKzOtVHcOpLMuKnF2qgVTUmtaqHUzufXOj5ZPFmWWo18zjoyubA6 CGvYSZ6OcGIZ0tLg+SLDg== X-UI-Out-Filterresults: notjunk:1;V01:K0:bSBqwf6Ze3E=:RlBDSIwMzxoQ6CyN0K7LVO yt+Ak62CIECUpNrjgf5KfRmy0+x9vsaNvXf5b8DJyhRnusWPVIm8t0WOGcUQlJaNTGmMMVWBW 5xMYZ4RkIHTGrTgeaZiY8LHHoe+Eti4oSeJz9UDZc5zIDMtYi4y1L0SuU9h6Fyn1TvA2mBlWE +JjthNd5UZfmtet9cwR3qldowRXSpeWnjqWri/ebeOE9SK90jB2jBbPsPsLUTuCpTk4a8ClZE 4gouD/Pi7aTq2YDNF3sf2ZYUbhbU3f8xfy8NjnQ7mPf5zQtTA7+m0YBeYlhvXn819XWPiSD1u h3wiLsP/RTpVmw1GagfUbkUXov8BfpXDYd02bGB5tBrsZDPMOTPeM+IGzwlHS5Y7V/X1G4O6Y MUTkC4+W8A2AFKnporUCsfvmTDcOoqG5buhWLcS0aRphXnRrzHikeFhxRIBH81ShV0qRAM7kk Id0wJmpp+86xWeEZsrk+04eQWnR8vinjAjtKauFq+Y+bRhxqed/XhynFMDMmdigWZh3aECWOa G+P15eJ5Svou4+LAVjdMMtmB9o2Op+6+2RaJ9nIKhW6ILIlb7LHwh4BELDsXTOhG590inxtrO PCfF5IOVYKpnlx5zc0RxebwWX+jjJRFJZyXWOtJOF+HIkdjEaEUynJYQL5CTKawajEhZHxwBL j98h+jZgOKKr+L6Mk23BiUIqMGONB5DtHg3cEj9UpcD6DASDFuFLEBSph8wVanRDkGJM= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181005_092317_788199_5ED3BB5E X-CRM114-Status: GOOD ( 12.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stephen Rothwell , Alexandre Ghiti , Arnd Bergmann , linux-kernel@vger.kernel.org, Russell King , Luiz Capitulino , linux-arm-kernel@lists.infradead.org, Mike Kravetz MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The check for __HAVE_ARCH_HUGE_PTEP_GET comes before the definition, leading to an extraneous definition of huge_ptep_get: In file included from arch/arm/include/asm/hugetlb.h:28, from include/linux/hugetlb.h:456, from arch/arm/kvm/../../../virt/kvm/arm/mmu.c:22: arch/arm/include/asm/hugetlb-3level.h:33:21: error: redefinition of 'huge_ptep_get' static inline pte_t huge_ptep_get(pte_t *ptep) Change the header file inclusions to be in the correct order for this to work. Fixes: bb1d18ffc7ae ("hugetlb: introduce generic version of huge_ptep_get") Signed-off-by: Arnd Bergmann --- arch/arm/include/asm/hugetlb.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/include/asm/hugetlb.h b/arch/arm/include/asm/hugetlb.h index 3fcef21ff2c2..b67256c22b08 100644 --- a/arch/arm/include/asm/hugetlb.h +++ b/arch/arm/include/asm/hugetlb.h @@ -23,9 +23,8 @@ #define _ASM_ARM_HUGETLB_H #include -#include - #include +#include static inline int is_hugepage_only_range(struct mm_struct *mm, unsigned long addr, unsigned long len)