From patchwork Wed Feb 3 13:21:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102855 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp288627lbl; Wed, 3 Feb 2016 05:22:29 -0800 (PST) X-Received: by 10.66.145.162 with SMTP id sv2mr2072181pab.152.1454505749371; Wed, 03 Feb 2016 05:22:29 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cx6si9333869pad.130.2016.02.03.05.22.28; Wed, 03 Feb 2016 05:22:29 -0800 (PST) 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 S1755462AbcBCNW1 (ORCPT + 30 others); Wed, 3 Feb 2016 08:22:27 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:56642 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752008AbcBCNWZ (ORCPT ); Wed, 3 Feb 2016 08:22:25 -0500 Received: from wuerfel.localnet ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue101) with ESMTPSA (Nemesis) id 0MAMbS-1aKrUj3kdO-00BdWz; Wed, 03 Feb 2016 14:21:52 +0100 From: Arnd Bergmann To: Russell King Cc: Andrew Morton , Matthew Wilcox , Jan Kara , "Kirill A. Shutemov" , Ross Zwisler , Dan Williams , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arch@vger.kernel.org Subject: [PATCH] [RFC] ARM: modify pgd_t definition for TRANSPARENT_HUGEPAGE_PUD Date: Wed, 03 Feb 2016 14:21:48 +0100 Message-ID: <1773775.QWf7OyDGPh@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:N9h9jT+ZsiZ2ZiRaynpetOvLixU2bZQGcbzQVrA75jGOJjFkhDu 7GUsL7jyS6Ja6VhCbH2rJG3sJeWPSeRc4nzJiFbXjcsUm2UhPId02qYBOxVHWxKQdCvRVYT g1SS6834d2wtAYNAJxviQYIwsSgv4MuzzeZRrwl7cEFaD2qUvC1/dsNLsTiPV9SbL7Yhp81 qWLV0a3Yhadr9bUkUxR0g== X-UI-Out-Filterresults: notjunk:1; V01:K0:vpTcJPQpiaI=:qIfP1SeFZc4ZbDsev/rx+8 mkCicsqbOBdMUeBAzhHsEFMn+bTJ/tCHlBNkYxTd5eDBjtTu9yk9EbfLvv9QMlXm9SITQHHv3 KWFDftsgeO5LsaD/6GiXtXtR3BAOdhPT1rO4xpXGVA5fhJdym8PaTZ+V4XzDSxAAuBzxqlwce FXsN2a70u0pOC49CztPC19QqFRl8P3zy8jFY7tYvesfIT3Yuzl6I9xgCZ0YW460d08NTMydof HxssAerab3zzpEEbQfCQ1zR4vzhnyWR9Tndf4CtBv5IgJ2MYHV/d2OjKNCA7ng7Jd0cyflpHM /x9KDsmxcwuENTzufBAfHkHyuIpqsJaUn46i7tsa5CkOwOHs77KjLMuKkK1uV1NFIFYWPyUJy 7iBnxTcb9hI6KD6I99eLVR3wbmUDGXKL/heoEth4u6EHYRyUMXOZI8ODhYI+ERyEd/8yZz2/u 1ET7R3ihvG0R30LWlkhBxglt3RpkhG4WbCbT5YBFB7uVdRFvw/6zgmaRS+if3293s31bumido ooRWFSVVI4VBGvC/9qt5KTUkC12KJo97wABKG5XhD8WZkErq/bnD39f1SMBOyf6tPsUPZwMYc pOyS+XB/jNjL0iGpkDX26ZwF38LH/jDkp5gxWb27eqQVMcSJaRMV484UXuW/trh2ah09tosMb 7MfI+Mo4jhhSgNv1uZ+jXLaWJwOaH5sLXr/euACWOKS9+BWUs4gD5zR9tgXpafy9DP9WTp8c2 5dYRiMT4y/byT24u Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I ran into build errors on ARM after Willy's newly added generic TRANSPARENT_HUGEPAGE_PUD support. We don't support this feature on ARM at all, but the patch causes a build error anyway: In file included from ../kernel/memremap.c:17:0: ../include/linux/pfn_t.h:108:7: error: 'pud_mkdevmap' declared as function returning an array pud_t pud_mkdevmap(pud_t pud); We don't use a PUD on ARM, so pud_t is defined as pmd_t, which in turn is defined as typedef unsigned long pgd_t[2]; on NOMMU and on 2-level MMU configurations. There is an (unused) other definition using a struct around the array, which happens to work fine here. There is a comment in the file about the fact the other version is "easier on the compiler", and I've traced that version back to linux-2.1.80 when ARM support was first merged back in 1998. It's probably a safe assumption that this is no longer necessary: The same logic existed in asm-i386 at the time but was removed a year later in 2.3.23pre3. The STRICT_MM_TYPECHECKS logic also ended up getting copied into these files: arch/alpha/include/asm/page.h arch/arc/include/asm/page.h arch/arm/include/asm/pgtable-3level-types.h arch/arm64/include/asm/pgtable-types.h arch/ia64/include/asm/page.h arch/parisc/include/asm/page.h arch/powerpc/include/asm/page.h arch/sparc/include/asm/page_32.h arch/sparc/include/asm/page_64.h arch/tile/include/asm/page.h arch/unicore32/include/asm/page.h We should probably remove it everywhere, but for the moment, this minimal patch gets things to compile on linux-next. Signed-off-by: Arnd Bergmann Fixes: a27da20ed50e ("mm: add support for PUD-sized transparent hugepages") diff --git a/arch/arm/include/asm/page-nommu.h b/arch/arm/include/asm/page-nommu.h index d1b162a18dcb..3db1ca22fecb 100644 --- a/arch/arm/include/asm/page-nommu.h +++ b/arch/arm/include/asm/page-nommu.h @@ -31,12 +31,12 @@ */ typedef unsigned long pte_t; typedef unsigned long pmd_t; -typedef unsigned long pgd_t[2]; +typedef struct { unsigned long pgd[2]; } pgd_t; typedef unsigned long pgprot_t; #define pte_val(x) (x) #define pmd_val(x) (x) -#define pgd_val(x) ((x)[0]) +#define pgd_val(x) ((x).pgd[0]) #define pgprot_val(x) (x) #define __pte(x) (x) diff --git a/arch/arm/include/asm/pgtable-2level-types.h b/arch/arm/include/asm/pgtable-2level-types.h index 66cb5b0e89c5..9b9815d5ebd6 100644 --- a/arch/arm/include/asm/pgtable-2level-types.h +++ b/arch/arm/include/asm/pgtable-2level-types.h @@ -24,6 +24,9 @@ typedef u32 pteval_t; typedef u32 pmdval_t; +typedef struct { pmdval_t pgd[2]; } pgd_t; +#define pgd_val(x) ((x).pgd[0]) + #undef STRICT_MM_TYPECHECKS #ifdef STRICT_MM_TYPECHECKS @@ -32,12 +35,10 @@ typedef u32 pmdval_t; */ typedef struct { pteval_t pte; } pte_t; typedef struct { pmdval_t pmd; } pmd_t; -typedef struct { pmdval_t pgd[2]; } pgd_t; typedef struct { pteval_t pgprot; } pgprot_t; #define pte_val(x) ((x).pte) #define pmd_val(x) ((x).pmd) -#define pgd_val(x) ((x).pgd[0]) #define pgprot_val(x) ((x).pgprot) #define __pte(x) ((pte_t) { (x) } ) @@ -50,12 +51,10 @@ typedef struct { pteval_t pgprot; } pgprot_t; */ typedef pteval_t pte_t; typedef pmdval_t pmd_t; -typedef pmdval_t pgd_t[2]; typedef pteval_t pgprot_t; #define pte_val(x) (x) #define pmd_val(x) (x) -#define pgd_val(x) ((x)[0]) #define pgprot_val(x) (x) #define __pte(x) (x)