Merge branch 'x86/uv' into x86/devel
[linux-2.6] / include / linux / mman.h
index 4ad21c5..dab8892 100644 (file)
 #define OVERCOMMIT_NEVER               2
 
 #ifdef __KERNEL__
-#include <linux/config.h>
 #include <linux/mm.h>
 
 #include <asm/atomic.h>
 
 extern int sysctl_overcommit_memory;
 extern int sysctl_overcommit_ratio;
-extern atomic_t vm_committed_space;
+extern atomic_long_t vm_committed_space;
 
 #ifdef CONFIG_SMP
 extern void vm_acct_memory(long pages);
 #else
 static inline void vm_acct_memory(long pages)
 {
-       atomic_add(pages, &vm_committed_space);
+       atomic_long_add(pages, &vm_committed_space);
 }
 #endif