linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / linux / mman.h

diff --git a/include/linux/mman.h b/include/linux/mman.h
index 87920a0..18a5689 100644 (file)
--- a/include/linux/mman.h
+++ b/include/linux/mman.h
@@ -1,6 +1,10 @@
 #ifndef _LINUX_MMAN_H
 #define _LINUX_MMAN_H
 
+#include <linux/config.h>
+#include <linux/mm.h>
+
+#include <asm/atomic.h>
 #include <asm/mman.h>
 
 #define MREMAP_MAYMOVE 1
@@ -9,12 +13,6 @@
 #define OVERCOMMIT_GUESS               0
 #define OVERCOMMIT_ALWAYS              1
 #define OVERCOMMIT_NEVER               2
-
-#ifdef __KERNEL__
-#include <linux/mm.h>
-
-#include <asm/atomic.h>
-
 extern int sysctl_overcommit_memory;
 extern int sysctl_overcommit_ratio;
 extern atomic_t vm_committed_space;
@@ -65,5 +63,5 @@ calc_vm_flag_bits(unsigned long flags)
               _calc_vm_trans(flags, MAP_EXECUTABLE, VM_EXECUTABLE) |
               _calc_vm_trans(flags, MAP_LOCKED,     VM_LOCKED    );
 }
-#endif /* __KERNEL__ */
+
 #endif /* _LINUX_MMAN_H */