The patch titled
mm: remove implied vm_ops check
has been added to the -mm tree. Its filename is
remove-implied-vm_ops-check.patch
Patches currently in -mm which might be from [EMAIL PROTECTED] are
comment-typo-fix.patch
shmem_populate-avoid-an-useless-check-and-some-comments.patch
add-swap-cache-mapping-comment.patch
remove-implied-vm_ops-check.patch
x86_64-remove-duplicated-sys_time64.patch
uml-rename-kconfig-files-to-be-like-the-other-arches.patch
ptrace-i386-fix-syscall-audit-interaction-with-singlestep.patch
uml-support-ptrace-adds-the-host-sysemu-support-for-uml-and-general-usage.patch
uml-support-reorganize-ptrace_sysemu-support.patch
uml-support-add-ptrace_sysemu_singlestep-option-to-i386.patch
sysemu-fix-sysaudit--singlestep-interaction.patch
uml-support-sysemu-slight-cleanup-and-speedup.patch
uml-workaround-gdb-problems-on-debugging.patch
uml-fix-sigwinch-handler-race-while-waiting-for-signals.patch
uml-fixes-performance-regression-in-activate_mm-and-thus-exec.patch
From: Paolo 'Blaisorblade' Giarrusso <[EMAIL PROTECTED]>
If !vma->vm-ops we already BUG above, so retesting it is useless. The
compiler cannot optimize this because BUG is a macro and is not thus marked
noreturn; that should possibly be fixed.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
mm/memory.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff -puN mm/memory.c~remove-implied-vm_ops-check mm/memory.c
--- 25/mm/memory.c~remove-implied-vm_ops-check Wed Aug 17 14:50:14 2005
+++ 25-akpm/mm/memory.c Wed Aug 17 14:50:14 2005
@@ -1944,7 +1944,7 @@ static int do_file_page(struct mm_struct
* Fall back to the linear mapping if the fs does not support
* ->populate:
*/
- if (!vma->vm_ops || !vma->vm_ops->populate ||
+ if (!vma->vm_ops->populate ||
(write_access && !(vma->vm_flags & VM_SHARED))) {
pte_clear(mm, address, pte);
return do_no_page(mm, vma, address, write_access, pte, pmd);
_
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html