Context |
Check |
Description |
snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch powerpc/merge (3ae03872115a0a158508ee5a91337648aede547d)
|
snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch powerpc/next (c1bea0a840ac75dca19bc6aa05575a33eb9fd058)
|
snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch linus/master (467f8165a2b0e6accf3d0dd9c8089b1dbde29f7f)
|
snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch powerpc/fixes (5eedf9fe8db23313df104576845cec5f481b9b60)
|
snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch linux-next (0d52778b8710eb11cb616761a02aee0a7fd60425)
|
snowpatch_ozlabs/apply_patch |
fail
|
Failed to apply to any branch
|
@@ -483,14 +483,10 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm,
unsigned long addr,
pte_t *ptep, int full)
{
- if (full && radix_enabled()) {
- /*
- * We know that this is a full mm pte clear and
- * hence can be sure there is no parallel set_pte.
- */
+ if (radix_enabled())
return radix__ptep_get_and_clear_full(mm, addr, ptep, full);
- }
- return ptep_get_and_clear(mm, addr, ptep);
+ else
+ return ptep_get_and_clear(mm, addr, ptep);
}
@@ -185,6 +185,10 @@ static inline pte_t radix__ptep_get_and_clear_full(struct mm_struct *mm,
unsigned long old_pte;
if (full) {
+ /*
+ * We know that this is a full mm pte clear and
+ * hence can be sure there is no parallel set_pte.
+ */
old_pte = pte_val(*ptep);
*ptep = __pte(0);
} else
Currently the radix variant is only called when full=true. Allow radix to take over the entire function. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- arch/powerpc/include/asm/book3s/64/pgtable.h | 10 +++------- arch/powerpc/include/asm/book3s/64/radix.h | 4 ++++ 2 files changed, 7 insertions(+), 7 deletions(-)