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: 148225 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp643944lji; Fri, 5 Oct 2018 09:17:43 -0700 (PDT) X-Google-Smtp-Source: ACcGV610mgC2q3RGV7xbHgkzZYE+9DmYll3LH/w3gYnakBM+xXD5EkjY0xgTIcfaOa/tAS+naNt9 X-Received: by 2002:a62:f553:: with SMTP id n80-v6mr12596248pfh.59.1538756263028; Fri, 05 Oct 2018 09:17:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538756263; cv=none; d=google.com; s=arc-20160816; b=AiGrwLYZ5OwnYX9dx1mFgiOwhdjVCSqFEUnto7xJsIl506sfx7gONDoIe95RTLXdF7 G6W9ixPk+Xw8IVcFRxFnpSs3TsttrjJ4/MR8M8pXdAuXqyazITKFo4373spYfwFhKWzH CBCawjNyzY74rIJVReEskubi7BeumcMRRGJETvb4tIhvpap9PDFrVvLx9vE69kHbilCM ruCZixz5UPobj31dDIi3dxHHo1zy/M6Ikcn7nBDI2yQ/2KFF9rWYXiqGI2AT52CE54v6 G2rbEuaUmXk4vz9azOxOCrnEWXvJAznXh873OK6SIY9nH7AVwnRBl8GZYF+RrWUDA7K/ nelw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=e5SIEzBvdf0zxpHx/SXmiLnwxzTlqRv0mDfbgvtUaT0=; b=WhiO3BuGpmgWldD2lLJWFkmc5p0J2M/R9TgpNmp+oZdYKrTSOkjUKugiMWxv5TDSxe WebFmzfGo9kaipf/JcKtVzvw//GRefrRijI5HPm/RalYp7pVlcf923qtR60Z+WwnMQC/ BRAj67eGUgqdn6ercUMGo0Rg8K5VivJUz57fKv3Rc4DAsYj4hvaISQ/G7HjQtU5juF4f 9f+uvHomZEovxTVqhpY/Yr/vqLTKqjnmHq8WC9hJQ6V/czzVfme24h+kQiyZrVz/fYT0 jC4ri3C3HFV7q42zucZ2OJ4rAC/xzWVoR0S7ivtwqdl1YiUzkWVVCWcoxaThOsBa+daR Ls8Q== ARC-Authentication-Results: i=1; mx.google.com; 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 g12-v6si8672121plt.19.2018.10.05.09.17.42; Fri, 05 Oct 2018 09:17:43 -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; 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 S1729651AbeJEXRD (ORCPT + 32 others); Fri, 5 Oct 2018 19:17:03 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:38339 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728519AbeJEXRD (ORCPT ); Fri, 5 Oct 2018 19:17:03 -0400 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 Cc: Alexandre Ghiti , Luiz Capitulino , Mike Kravetz , Arnd Bergmann , Russell King , Stephen Rothwell , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org 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:eDG+3pQc0L8=:iJGSA+FAcp8LRF4VrlCb3v HbNT+oT/2JdqiQG049NjoWhN42bQenY0n6kk3Wm0VZVsuPB7IEbaWRx0G39PrFeZ+fSC9HeRx Nw6UvqS261mPq0GE4UW22Wk/6YS798yCyRTeNT0+CqLQEKdxHujBp4Osz9DemGnyxQOaKUmco O28Pc6Qd6wwGe4n/8yr6MV2hJCzY/+XN/I+T91eH/Wewan6bTUg+LI2aw6PNC5WF2Zt0Sg+2I ejeQk+ikInv/TFmPefpvqVO/ps9CIBVWmS47q5JJKdGgPpxuaI2a8o95HhzjuaQVMkKfkaj6B ZDfjgQaC7oBP+Ux/EEf9IyPolqhkzi87EhfSM8M9bscmoA5oVyC0gB4TSCKBNBL/t6w3RH8Tv S9AeHBJyituaIbMWbl/gUNeNGXzf/J1CT0UGuRewRJWLTD+LmF/ZJBqpQF41hShVaD6Cw0iXU Ey7Vq/TAYPy0/hDCIo1DNCJCCXJNinauF5bIXoEgJY44ifdUAyxHW1fdOPFABusFN7FxLctsR rAdI98yoH2RqXymZobrbHysWHXWgWuO4C5MK7jUSDW6S0rGnPDtkIHPDwX9AM6j2bm28ZyIuZ 8KFmME0oUj/q618YS/fQVKHEJjvO0rkcOQy7bVhyXqxUokJ4bnr4hxKE+FwGgdql+hM0nbfvC CBHu9idLo0Xx98U5/EsXc6byM9Cr5lB/gyTGFI0raYi1y+ElcJq/ocMhif4mR0sGdaJs= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.18.0 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)