Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

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

diff --git a/mm/nommu.c b/mm/nommu.c
index 2fff336..60745e2 100644 (file)
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -27,6 +27,8 @@
 #include <linux/personality.h>
 #include <linux/security.h>
 #include <linux/syscalls.h>
+#include <linux/vs_base.h>
+#include <linux/vs_memory.h>
 
 #include <asm/uaccess.h>
 #include <asm/tlb.h>
@@ -1070,7 +1072,6 @@ int remap_pfn_range(struct vm_area_struct *vma, unsigned long from,
        vma->vm_start = vma->vm_pgoff << PAGE_SHIFT;
        return 0;
 }
-EXPORT_SYMBOL(remap_pfn_range);
 
 void swap_unplug_io_fn(struct backing_dev_info *bdi, struct page *page)
 {
@@ -1091,7 +1092,6 @@ void unmap_mapping_range(struct address_space *mapping,
                         int even_cows)
 {
 }
-EXPORT_SYMBOL(unmap_mapping_range);
 
 /*
  * Check that a process has enough memory to allocate a new virtual
@@ -1124,7 +1124,7 @@ int __vm_enough_memory(long pages, int cap_sys_admin)
        if (sysctl_overcommit_memory == OVERCOMMIT_GUESS) {
                unsigned long n;
 
-               free = global_page_state(NR_FILE_PAGES);
+               free = get_page_cache_size();
                free += nr_swap_pages;
 
                /*