The patch titled Subject: mm-autonuma-dont-use-set_pte_at-when-updating-protnone-ptes-fix has been removed from the -mm tree. Its filename was mm-autonuma-dont-use-set_pte_at-when-updating-protnone-ptes-fix.patch This patch was dropped because it was folded into mm-autonuma-dont-use-set_pte_at-when-updating-protnone-ptes.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-autonuma-dont-use-set_pte_at-when-updating-protnone-ptes-fix remove unwanted ppc change, per Aneesh Cc: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Cc: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx> Cc: Rik van Riel <riel@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/powerpc/mm/pgtable.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff -puN arch/powerpc/mm/pgtable.c~mm-autonuma-dont-use-set_pte_at-when-updating-protnone-ptes-fix arch/powerpc/mm/pgtable.c --- a/arch/powerpc/mm/pgtable.c~mm-autonuma-dont-use-set_pte_at-when-updating-protnone-ptes-fix +++ a/arch/powerpc/mm/pgtable.c @@ -186,7 +186,12 @@ static pte_t set_access_flags_filter(pte void set_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte) { - VM_WARN_ON(pte_present(*ptep)); + /* + * When handling numa faults, we already have the pte marked + * _PAGE_PRESENT, but we can be sure that it is not in hpte. + * Hence we can use set_pte_at for them. + */ + VM_WARN_ON(pte_present(*ptep) && !pte_protnone(*ptep)); /* * Add the pte bit when tryint set a pte _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are mm-memory_hotplugc-unexport-__remove_pages.patch z3fold-add-kref-refcounting-checkpatch-fixes.patch mm-autonuma-dont-use-set_pte_at-when-updating-protnone-ptes.patch linux-kernelh-fix-div_round_closest-to-support-negative-divisors-fix.patch lib-update-lz4-compressor-module.patch lib-update-lz4-compressor-module-fix-fix.patch lib-update-lz4-compressor-module-fix-fix-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html