diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2015-05-14 12:54:35 -0700 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-15 08:19:24 +1000 |
commit | ecc81b6b2f2ed94041f0768234a3e9a2b441d329 (patch) | |
tree | 9788b47a7846f88953a51b10539100ceb044b69f | |
parent | 724ffd8fea43a0452ed35ff47c9997df3ba50ce8 (diff) | |
download | linux-ecc81b6b2f2ed94041f0768234a3e9a2b441d329.tar.gz linux-ecc81b6b2f2ed94041f0768234a3e9a2b441d329.tar.xz |
mm-thp-split-out-pmd-collpase-flush-into-a-separate-functions-fix-2
Not all architectures implement __pmd() (eg m68k)
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Reported-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r-- | include/asm-generic/pgtable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index a06b01db241d..e06cbeae14b2 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -208,7 +208,7 @@ static inline pmd_t pmdp_collapse_flush(struct vm_area_struct *vma, pmd_t *pmdp) { BUILD_BUG(); - return __pmd(0); + return *pmdp; } #define pmdp_collapse_flush pmdp_collapse_flush #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ |