From mboxrd@z Thu Jan 1 00:00:00 1970 From: arnd@arndb.de (Arnd Bergmann) Date: Fri, 16 Oct 2015 22:02:04 +0200 Subject: [PATCH] ARM: thp: fix unterminated ifdef in header file Message-ID: <5446974.UXhT00HeJk@wuerfel> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org A recent change accidentally removed one line more than it should have, causing the build to fail with ARM LPAE: In file included from /git/arm-soc/arch/arm/include/asm/pgtable.h:31:0, from /git/arm-soc/include/linux/mm.h:55, from /git/arm-soc/arch/arm/kernel/asm-offsets.c:15: /git/arm-soc/arch/arm/include/asm/pgtable-3level.h:20:0: error: unterminated #ifndef #ifndef _ASM_PGTABLE_3LEVEL_H This puts the line back where it was. Signed-off-by: Arnd Bergmann Fixes: f054144a1b23 ("arm, thp: remove infrastructure for handling splitting PMDs") --- I noticed this on today's linux-next. It's likely that someone else did too and already submitted a patch, so mine can be ignored. Otherwise please fold into the original patch. diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h index d42f81f13618..dc46398bc3a5 100644 --- a/arch/arm/include/asm/pgtable-3level.h +++ b/arch/arm/include/asm/pgtable-3level.h @@ -231,6 +231,7 @@ static inline pte_t pte_mkspecial(pte_t pte) #ifdef CONFIG_TRANSPARENT_HUGEPAGE #define pmd_trans_huge(pmd) (pmd_val(pmd) && !pmd_table(pmd)) +#endif #define PMD_BIT_FUNC(fn,op) \ static inline pmd_t pmd_##fn(pmd_t pmd) { pmd_val(pmd) op; return pmd; } From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by kanga.kvack.org (Postfix) with ESMTP id 29B3682F65 for ; Fri, 16 Oct 2015 16:02:37 -0400 (EDT) Received: by wicgb1 with SMTP id gb1so22811648wic.1 for ; Fri, 16 Oct 2015 13:02:36 -0700 (PDT) Received: from mout.kundenserver.de (mout.kundenserver.de. [212.227.17.24]) by mx.google.com with ESMTPS id ce5si8352112wjb.106.2015.10.16.13.02.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Oct 2015 13:02:36 -0700 (PDT) From: Arnd Bergmann Subject: [PATCH] ARM: thp: fix unterminated ifdef in header file Date: Fri, 16 Oct 2015 22:02:04 +0200 Message-ID: <5446974.UXhT00HeJk@wuerfel> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: owner-linux-mm@kvack.org List-ID: To: Andrew Morton Cc: "Kirill A. Shutemov" , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org A recent change accidentally removed one line more than it should have, causing the build to fail with ARM LPAE: In file included from /git/arm-soc/arch/arm/include/asm/pgtable.h:31:0, from /git/arm-soc/include/linux/mm.h:55, from /git/arm-soc/arch/arm/kernel/asm-offsets.c:15: /git/arm-soc/arch/arm/include/asm/pgtable-3level.h:20:0: error: unterminated #ifndef #ifndef _ASM_PGTABLE_3LEVEL_H This puts the line back where it was. Signed-off-by: Arnd Bergmann Fixes: f054144a1b23 ("arm, thp: remove infrastructure for handling splitting PMDs") --- I noticed this on today's linux-next. It's likely that someone else did too and already submitted a patch, so mine can be ignored. Otherwise please fold into the original patch. diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h index d42f81f13618..dc46398bc3a5 100644 --- a/arch/arm/include/asm/pgtable-3level.h +++ b/arch/arm/include/asm/pgtable-3level.h @@ -231,6 +231,7 @@ static inline pte_t pte_mkspecial(pte_t pte) #ifdef CONFIG_TRANSPARENT_HUGEPAGE #define pmd_trans_huge(pmd) (pmd_val(pmd) && !pmd_table(pmd)) +#endif #define PMD_BIT_FUNC(fn,op) \ static inline pmd_t pmd_##fn(pmd_t pmd) { pmd_val(pmd) op; return pmd; } -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932750AbbJPUCe (ORCPT ); Fri, 16 Oct 2015 16:02:34 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:49483 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932106AbbJPUCd (ORCPT ); Fri, 16 Oct 2015 16:02:33 -0400 From: Arnd Bergmann To: Andrew Morton Cc: "Kirill A. Shutemov" , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: thp: fix unterminated ifdef in header file Date: Fri, 16 Oct 2015 22:02:04 +0200 Message-ID: <5446974.UXhT00HeJk@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:lpv1WROJxtBaYSY2slZqmSxfWV6PAdIcLMui2WoKSF67BCghLfl At3LXz5B++rlNZfrpA25xYhJwE/JtsH4c6Trh46efN/OeCDUlO6pmXhUbHIUfnBDckIP2H5 6XfFUHkS6MNPf93n+drsglszvkBTtAtEUeDqxO7T/2dqyP1IiTnEFKY0T9csIJsqoyhnrff DpXUb4Rxs+UJa5z5FH8og== X-UI-Out-Filterresults: notjunk:1;V01:K0:YfuQI1pJrKU=:j+nJoDuZ60/qhaHbnC+XiV WBUzxZ5q4YooIWM8hoR8cBNQwn0BHXIZK4kMsvqZG0Qf1xKLngfdmcj1wRUfMU4zlotnwK/Gk 9z2gwXNwOMnLrxu1P7oqQIZXen7hJBjTFRJzkza9fgd7bDyO0dyWItKeVVvMAssEH7m1FDZ/c zsE4KNLUxqntsu3dtJmYvzOi3tb9zRTtrvexdKfvCJrCeNWI/mvcB67FSW2N2Fj3Qn02znvZY Pqp/NpxmS2m2k0mFK+rD6imt3woBALcXohwYqfaecTksFTBUs20AQ2rAhsHjVtJtu27kAqn8h e4fblZm08/KgamO1pBxPDhe0CQiBOhFi7GLDTfXJwoSrhbNgd/7WiKLgqOKSgJdgkpXsAahN8 3VyBhtSk55c1ZEqYiDF9gL/6uTbxw2EBQGvjJqbfgirwrzgioAnydCjWnUoywRh9UC4xtpFXM FzHz+yxiqoJ0973VqpkVZ7ANKevMfHlaMEcDbz+tYYsdyJyXalBaa7vsvIZ4wqk3ZKkIbxfbQ gSD6ub/BKBTuIRJKjPS2jCDm/TBcz9dxj6lLCLvi0xAUscdqH0s25CO9i2zQ02pFnT8YMPlnK xL0FPfNUw8sNVf++CzOrStfeDPxMVr5QBefRsc9ZHmhAhtYYND4MZXJQpjXTCpLl45+8u2t5O rAKv87V3zatbFPQ+b82SIsCqQ3A5apcHfJxMVI88TSGWA39pElkMZlsjVFh3bKwW0datyxaUF ikb97hLqt5K/yllO Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A recent change accidentally removed one line more than it should have, causing the build to fail with ARM LPAE: In file included from /git/arm-soc/arch/arm/include/asm/pgtable.h:31:0, from /git/arm-soc/include/linux/mm.h:55, from /git/arm-soc/arch/arm/kernel/asm-offsets.c:15: /git/arm-soc/arch/arm/include/asm/pgtable-3level.h:20:0: error: unterminated #ifndef #ifndef _ASM_PGTABLE_3LEVEL_H This puts the line back where it was. Signed-off-by: Arnd Bergmann Fixes: f054144a1b23 ("arm, thp: remove infrastructure for handling splitting PMDs") --- I noticed this on today's linux-next. It's likely that someone else did too and already submitted a patch, so mine can be ignored. Otherwise please fold into the original patch. diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h index d42f81f13618..dc46398bc3a5 100644 --- a/arch/arm/include/asm/pgtable-3level.h +++ b/arch/arm/include/asm/pgtable-3level.h @@ -231,6 +231,7 @@ static inline pte_t pte_mkspecial(pte_t pte) #ifdef CONFIG_TRANSPARENT_HUGEPAGE #define pmd_trans_huge(pmd) (pmd_val(pmd) && !pmd_table(pmd)) +#endif #define PMD_BIT_FUNC(fn,op) \ static inline pmd_t pmd_##fn(pmd_t pmd) { pmd_val(pmd) op; return pmd; }