Skip to contentSkip to conversation

ARM: thp: fix unterminated ifdef in header file

PATCH In review Arnd Bergmann 2 participants 2 messages Oct 16, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: thp: fix unterminated ifdef in header file

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.

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.

arch/arm/include/asm/pgtable-3level.h +1 -0
index d42f81f13618..dc46398bc3a5 100644
@@ -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; }
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Arnd Bergmann

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:
Quoted 7 lines

/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.

Fixes f054144a1b23 ("arm, thp: remove infrastructure for handling splitting PMDs")

Sorry.

Signature · 1 line
 Kirill A. Shutemov