Merge branch 'master' into upstream

2006-09-12 12:03:21 -04:00
parent 76ff3c6e3b 05ff0e291a
commit 97148ba223
131 changed files with 988 additions and 790 deletions
--- a/include/asm-sparc/mman.h
+++ b/include/asm-sparc/mman.h
@@ -35,4 +35,12 @@

 #define MADV_FREE	0x5		/* (Solaris) contents can be freed */

+#ifdef __KERNEL__
+#ifndef __ASSEMBLY__
+#define arch_mmap_check	sparc_mmap_check
+int sparc_mmap_check(unsigned long addr, unsigned long len,
+		unsigned long flags);
+#endif
+#endif
+
 #endif /* __SPARC_MMAN_H__ */