projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-3.10.y' of git://git.kernel.org/pub/scm/linux/kernel/git/stable...
[firefly-linux-kernel-4.4.55.git]
/
include
/
asm-generic
/
pgtable.h
diff --git
a/include/asm-generic/pgtable.h
b/include/asm-generic/pgtable.h
index 17bccd3a4b03fdfbe4db34bcc81b6df5ba25fd4b..dd6d9b89d338bb4fa7afe117d51e738480ffa6b6 100644
(file)
--- a/
include/asm-generic/pgtable.h
+++ b/
include/asm-generic/pgtable.h
@@
-550,11
+550,10
@@
static inline int pmd_none_or_trans_huge_or_clear_bad(pmd_t *pmd)
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
barrier();
#endif
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
barrier();
#endif
- if (pmd_none(pmdval))
+ if (pmd_none(pmdval)
|| pmd_trans_huge(pmdval)
)
return 1;
if (unlikely(pmd_bad(pmdval))) {
return 1;
if (unlikely(pmd_bad(pmdval))) {
- if (!pmd_trans_huge(pmdval))
- pmd_clear_bad(pmd);
+ pmd_clear_bad(pmd);
return 1;
}
return 0;
return 1;
}
return 0;