diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-01-13 13:35:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-01-13 13:35:28 +0100 |
| commit | 56b4811039174bba9cbd68318d0d8b1585b9eded (patch) | |
| tree | f3e8f99e85e545662d82e18bef2a7009c2948852 /include/asm-generic/pgtable.h | |
| parent | e777b63bbd589248eb151a3191ee92331a701385 (diff) | |
| parent | 9722c2dac708e9468cc0dc30218ef76946ffbc9d (diff) | |
| download | blackbird-op-linux-56b4811039174bba9cbd68318d0d8b1585b9eded.tar.gz blackbird-op-linux-56b4811039174bba9cbd68318d0d8b1585b9eded.zip | |
Merge branch 'sched/urgent' into sched/core
Pick up the latest fixes before applying new changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/asm-generic/pgtable.h')
| -rw-r--r-- | include/asm-generic/pgtable.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index f330d28e4d0e..db0923458940 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -217,7 +217,7 @@ static inline int pmd_same(pmd_t pmd_a, pmd_t pmd_b) #endif #ifndef pte_accessible -# define pte_accessible(pte) ((void)(pte),1) +# define pte_accessible(mm, pte) ((void)(pte), 1) #endif #ifndef flush_tlb_fix_spurious_fault @@ -599,11 +599,10 @@ static inline int pmd_none_or_trans_huge_or_clear_bad(pmd_t *pmd) #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))) { - if (!pmd_trans_huge(pmdval)) - pmd_clear_bad(pmd); + pmd_clear_bad(pmd); return 1; } return 0; |
