Merge branch 'master' into upstream

This commit is contained in:
Jeff Garzik 2006-09-12 12:03:21 -04:00
commit 97148ba223
131 changed files with 988 additions and 790 deletions

View file

@ -35,4 +35,12 @@
#define MADV_FREE 0x5 /* (Solaris) contents can be freed */
#ifdef __KERNEL__
#ifndef __ASSEMBLY__
#define arch_mmap_check sparc64_mmap_check
int sparc64_mmap_check(unsigned long addr, unsigned long len,
unsigned long flags);
#endif
#endif
#endif /* __SPARC64_MMAN_H__ */