The patch titled Subject: x86-pat-separate-the-pfn-attribute-tracking-for-remap_pfn_range-and-vm_insert_pfn-fix has been removed from the -mm tree. Its filename was x86-pat-separate-the-pfn-attribute-tracking-for-remap_pfn_range-and-vm_insert_pfn-fix.patch This patch was dropped because it was folded into x86-pat-separate-the-pfn-attribute-tracking-for-remap_pfn_range-and-vm_insert_pfn.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: x86-pat-separate-the-pfn-attribute-tracking-for-remap_pfn_range-and-vm_insert_pfn-fix tweak a few comments Cc: Konstantin Khlebnikov <khlebnikov@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86/mm/pat.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff -puN arch/x86/mm/pat.c~x86-pat-separate-the-pfn-attribute-tracking-for-remap_pfn_range-and-vm_insert_pfn-fix arch/x86/mm/pat.c --- a/arch/x86/mm/pat.c~x86-pat-separate-the-pfn-attribute-tracking-for-remap_pfn_range-and-vm_insert_pfn-fix +++ a/arch/x86/mm/pat.c @@ -712,14 +712,12 @@ int track_pfn_remap(struct vm_area_struc return 0; /* - * for anything smaller than the vma size, - * we set prot based on the lookup. + * For anything smaller than the vma size we set prot based on the + * lookup. */ flags = lookup_memtype(paddr); - /* - * Check memtype for the rest pages - */ + /* Check memtype for the remaining pages */ while (size > PAGE_SIZE) { size -= PAGE_SIZE; paddr += PAGE_SIZE; @@ -741,7 +739,7 @@ int track_pfn_insert(struct vm_area_stru if (!pat_enabled) return 0; - /* we set prot based on lookup */ + /* Set prot based on lookup */ flags = lookup_memtype((resource_size_t)pfn << PAGE_SHIFT); *prot = __pgprot((pgprot_val(vma->vm_page_prot) & (~_PAGE_CACHE_MASK)) | flags); _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch x86-pat-separate-the-pfn-attribute-tracking-for-remap_pfn_range-and-vm_insert_pfn.patch mm-kill-vma-flag-vm_reserved-and-mm-reserved_vm-counter-fix.patch mm-fix-nonuniform-page-status-when-writing-new-file-with-small-buffer-fix.patch mm-fix-nonuniform-page-status-when-writing-new-file-with-small-buffer-fix-fix.patch mm-vmscan-scale-number-of-pages-reclaimed-by-reclaim-compaction-based-on-failures-fix.patch mm-mmu_notifier-fix-inconsistent-memory-between-secondary-mmu-and-host-fix.patch rbtree-performance-and-correctness-test-fix.patch mm-cma-discard-clean-pages-during-contiguous-allocation-instead-of-migration-fix-fix.patch mm-fix-tracing-in-free_pcppages_bulk-fix.patch cma-count-free-cma-pages-fix.patch memory-hotplug-fix-pages-missed-by-race-rather-than-failng-fix.patch atomic-implement-generic-atomic_dec_if_positive-fix.patch mm-compaction-abort-compaction-loop-if-lock-is-contended-or-run-too-long.patch mm-compaction-abort-compaction-loop-if-lock-is-contended-or-run-too-long-fix.patch mm-compaction-abort-compaction-loop-if-lock-is-contended-or-run-too-long-fix-2.patch mm-compaction-acquire-the-zone-lru_lock-as-late-as-possible-fix-fix.patch mm-page_alloc-refactor-out-__alloc_contig_migrate_alloc-checkpatch-fixes.patch mm-fix-invalidate_complete_page2-lock-ordering.patch mm-numa-reclaim-from-all-nodes-within-reclaim-distance-fix.patch mm-move-all-mmu-notifier-invocations-to-be-done-outside-the-pt-lock.patch cma-migrate-mlocked-pages-fix.patch mm-avoid-section-mismatch-warning-for-memblock_type_name-fix.patch mm-document-pagehuge-somewhat.patch mm-memcg-clean-up-mm_match_cgroup-signature-fix.patch memory-hotplug-suppress-trying-to-free-nonexistent-resource-xxxxxxxxxxxxxxxx-yyyyyyyyyyyyyyyy-warning.patch mm-add-and-use-update_mmu_cache_pmd-in-transparent-huge-page-code-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