Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

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

diff --git a/include/asm-ia64/mman.h b/include/asm-ia64/mman.h
index b242f95..c73b878 100644 (file)
--- a/include/asm-ia64/mman.h
+++ b/include/asm-ia64/mman.h
@@ -8,14 +8,6 @@
  *     David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
  */
 
-#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
-#define arch_mmap_check        ia64_map_check_rgn
-int ia64_map_check_rgn(unsigned long addr, unsigned long len,
-               unsigned long flags);
-#endif
-#endif
-
 #include <asm-generic/mman.h>
 
 #define MAP_GROWSDOWN  0x00100         /* stack-like segment */
@@ -30,4 +22,12 @@ int ia64_map_check_rgn(unsigned long addr, unsigned long len,
 #define MCL_CURRENT    1               /* lock all current mappings */
 #define MCL_FUTURE     2               /* lock all future mappings */
 
+#ifdef __KERNEL__
+#ifndef __ASSEMBLY__
+#define arch_mmap_check        ia64_mmap_check
+int ia64_mmap_check(unsigned long addr, unsigned long len,
+               unsigned long flags);
+#endif
+#endif
+
 #endif /* _ASM_IA64_MMAN_H */