The patch titled
do_no_pfn tweaks
has been removed from the -mm tree. Its filename is
do_no_pfn-tweaks.patch
This patch was dropped because it was folded into do_no_pfn.patch
------------------------------------------------------
Subject: do_no_pfn tweaks
From: Andrew Morton <akpm@xxxxxxxx>
We don't want the rarely-used do_no_pfn() to get inlined in the oft-used
handle_pte_fault(), using up icache. Mark it noinline and unlikely.
Cc: Linus Torvalds <torvalds@xxxxxxxx>
Cc: Hugh Dickins <hugh@xxxxxxxxxxx>
Cc: Nick Piggin <nickpiggin@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
mm/memory.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff -puN mm/memory.c~do_no_pfn-tweaks mm/memory.c
--- a/mm/memory.c~do_no_pfn-tweaks
+++ a/mm/memory.c
@@ -2268,8 +2268,10 @@ oom:
*
* It is expected that the ->nopfn handler always returns the same pfn
* for a given virtual mapping.
+ *
+ * Mark this `noinline' to prevent it from bloating the main pagefault code.
*/
-static int do_no_pfn(struct mm_struct *mm, struct vm_area_struct *vma,
+static noinline int do_no_pfn(struct mm_struct *mm, struct vm_area_struct *vma,
unsigned long address, pte_t *page_table, pmd_t *pmd,
int write_access)
{
@@ -2368,7 +2370,7 @@ static inline int handle_pte_fault(struc
return do_no_page(mm, vma, address,
pte, pmd,
write_access);
- if (vma->vm_ops->nopfn)
+ if (unlikely(vma->vm_ops->nopfn))
return do_no_pfn(mm, vma, address, pte,
pmd, write_access);
}
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
revert-x86_64-mm-i386-remove-lock-section.patch
fix-x86_64-mm-spinlock-cleanup.patch
have-x86-use-add_active_range-and-free_area_init_nodes.patch
vm-add-per-zone-writeout-counter.patch
slab-fix-kmalloc_node-applying-memory-policies-if-nodeid-==-numa_node_id.patch
gfp_thisnode-for-the-slab-allocator-v2.patch
do_no_pfn.patch
do_no_pfn-tweaks.patch
nommu-set-bdi-capabilities-for-dev-mem-and-dev-kmem-tidy.patch
nommu-move-the-fallback-arch_vma_name-to-a-sensible-place-fix.patch
inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-fix-fix.patch
x86-microcode-microcode-driver-cleanup-tidy.patch
x86-microcode-add-sysfs-and-hotplug-support-fix.patch
eisa-bus-modalias-attributes-support-1-fix-git-kbuild-fix.patch
add-address_space_operationsbatch_write-fix.patch
alloc_fdtable-cleanup.patch
sysctl-allow-proc-sys-without-sys_sysctl-fix.patch
add-probe_kernel_address.patch
x86-use-probe_kernel_address-in-handle_bug.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
