Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1249130 > unrolled thread
| Started by | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| First post | 2015-10-16 22:10 +0200 |
| Last post | 2015-10-16 22:50 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] ARM: thp: fix unterminated ifdef in header file Arnd Bergmann <arnd@arndb.de> - 2015-10-16 22:10 +0200
Re: [PATCH] ARM: thp: fix unterminated ifdef in header file "Kirill A. Shutemov" <kirill@shutemov.name> - 2015-10-16 22:50 +0200
| From | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| Date | 2015-10-16 22:10 +0200 |
| Subject | [PATCH] ARM: thp: fix unterminated ifdef in header file |
| Message-ID | <qkju9-8qx-19@gated-at.bofh.it> |
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 <arnd@arndb.de>
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 from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | "Kirill A. Shutemov" <kirill@shutemov.name> |
|---|---|
| Date | 2015-10-16 22:50 +0200 |
| Message-ID | <qkk6S-IR-17@gated-at.bofh.it> |
| In reply to | #1249130 |
On Fri, Oct 16, 2015 at 10:02:04PM +0200, Arnd Bergmann wrote:
> 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 <arnd@arndb.de>
> Fixes: f054144a1b23 ("arm, thp: remove infrastructure for handling splitting PMDs")
Sorry.
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
--
Kirill A. Shutemov
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web