diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-06-09 12:50:13 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-06-09 12:50:13 +0800 |
| commit | 0f830724eda986b8df77a1e195f4f4b2d5dbb304 (patch) | |
| tree | 3d363082923fa7c1d173dbad581347c3c1c63cba /arch/arm64/mm | |
| parent | 725d91ac39df01eb3a1983039d1fcb29a8711c6f (diff) | |
| parent | a1bc295d7a4be9425bbeecc005d0cd013eb46cea (diff) | |
Merge LTS 3.14.6 into linux-linaro-lsk-v3.14
This is the 3.14.6 stable release
Diffstat (limited to 'arch/arm64/mm')
| -rw-r--r-- | arch/arm64/mm/hugetlbpage.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index 5e9aec358306..31eb959e9aa8 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -51,7 +51,11 @@ int pmd_huge(pmd_t pmd) int pud_huge(pud_t pud) { +#ifndef __PAGETABLE_PMD_FOLDED return !(pud_val(pud) & PUD_TABLE_BIT); +#else + return 0; +#endif } int pmd_huge_support(void) |