patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / mm / nommu.c

diff --git a/mm/nommu.c b/mm/nommu.c
index c940756..5872905 100644 (file)
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -18,6 +18,7 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/blkdev.h>
+#include <linux/backing-dev.h>
 
 #include <asm/pgalloc.h>
 #include <asm/uaccess.h>
@@ -33,6 +34,9 @@ atomic_t vm_committed_space = ATOMIC_INIT(0);
 int sysctl_overcommit_memory; /* default is heuristic overcommit */
 int sysctl_overcommit_ratio = 50; /* default is 50% */
 
+int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
+EXPORT_SYMBOL(sysctl_max_map_count);
+
 /*
  * Handle all mappings that got truncated by a "truncate()"
  * system call.
@@ -485,7 +489,7 @@ int do_munmap(struct mm_struct * mm, unsigned long addr, size_t len)
        show_process_blocks();
 #endif   
 
-       return -EINVAL;
+       return 0;
 }
 
 /* Release all mmaps. */
@@ -568,6 +572,6 @@ unsigned long get_unmapped_area(struct file *file, unsigned long addr,
        return -ENOMEM;
 }
 
-void pte_chain_init(void)
+void swap_unplug_io_fn(struct backing_dev_info *)
 {
 }