summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2016-02-03 15:48:49 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2016-02-03 15:51:02 +1100
commit3a498c9b681cb4cbfea3ac454d26a219865f90b4 (patch)
tree6fdb9fdf851eb609cb6305a9bea6623ef71523c3
parentcd5de48403c60f6c72dc816c29bc709411986894 (diff)
downloadlinux-next-3a498c9b681cb4cbfea3ac454d26a219865f90b4.tar.gz
mm: fix 2 for add support for PUD-sized transparent hugepages
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
-rw-r--r--include/asm-generic/pgtable.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
index 52c91858c194..7a2a969e7dea 100644
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
@@ -692,7 +692,7 @@ static inline int pmd_write(pmd_t pmd)
#endif /* __HAVE_ARCH_PMD_WRITE */
#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
-#ifndef CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD
+#if !defined(CONFIG_TRANSPARENT_HUGEPAGE) || !defined(CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD)
static inline int pud_trans_huge(pud_t pud)
{
return 0;