X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=mm%2Ffilemap.c;h=ef169f37156da22cc3f07d5dd9092dea00315b7f;hb=0d87841997125971b7a39d21d1435054f91884c3;hp=33349adb227a9c46edef94e06cab205b8f6113bc;hpb=25d9e2d15286281ec834b829a4aaf8969011f1cd;p=safe%2Fjmp%2Flinux-2.6

diff --git a/mm/filemap.c b/mm/filemap.c
index 33349ad..ef169f3 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -104,6 +104,10 @@
  *
  *  ->task->proc_lock
  *    ->dcache_lock		(proc_pid_lookup)
+ *
+ *  (code doesn't rely on that order, so you could switch it around)
+ *  ->tasklist_lock             (memory_failure, collect_procs_ao)
+ *    ->i_mmap_lock
  */
 
 /*
@@ -1607,7 +1611,7 @@ page_not_uptodate:
 }
 EXPORT_SYMBOL(filemap_fault);
 
-struct vm_operations_struct generic_file_vm_ops = {
+const struct vm_operations_struct generic_file_vm_ops = {
 	.fault		= filemap_fault,
 };