git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
[pandora-kernel.git]
/
arch
/
arm64
/
mm
/
hugetlbpage.c
diff --git
a/arch/arm64/mm/hugetlbpage.c
b/arch/arm64/mm/hugetlbpage.c
index
2de9d2e
..
831ec53
100644
(file)
--- a/
arch/arm64/mm/hugetlbpage.c
+++ b/
arch/arm64/mm/hugetlbpage.c
@@
-31,22
+31,15
@@
#include <asm/tlbflush.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
#include <asm/pgalloc.h>
-#ifndef CONFIG_ARCH_WANT_HUGE_PMD_SHARE
-int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)
-{
- return 0;
-}
-#endif
-
int pmd_huge(pmd_t pmd)
{
int pmd_huge(pmd_t pmd)
{
- return !(pmd_val(pmd) & PMD_TABLE_BIT);
+ return
pmd_val(pmd) &&
!(pmd_val(pmd) & PMD_TABLE_BIT);
}
int pud_huge(pud_t pud)
{
#ifndef __PAGETABLE_PMD_FOLDED
}
int pud_huge(pud_t pud)
{
#ifndef __PAGETABLE_PMD_FOLDED
- return !(pud_val(pud) & PUD_TABLE_BIT);
+ return
pud_val(pud) &&
!(pud_val(pud) & PUD_TABLE_BIT);
#else
return 0;
#endif
#else
return 0;
#endif