aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-sparc
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-12 12:03:21 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-12 12:03:21 -0400
commit97148ba2235e334e57d05fa07045cf3e6629763c (patch)
treea04504e7d4feb0dacfe1862a59abecaf99997f09 /include/asm-sparc
parent76ff3c6e3b389a5a7692811dd456e0ff58340cac (diff)
parent05ff0e291af086f4325bac76abad250690bbbd63 (diff)
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-sparc')
-rw-r--r--include/asm-sparc/mman.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-sparc/mman.h b/include/asm-sparc/mman.h
index 88d1886abf3..b7dc40bc68f 100644
--- a/include/asm-sparc/mman.h
+++ b/include/asm-sparc/mman.h
@@ -35,4 +35,12 @@
35 35
36#define MADV_FREE 0x5 /* (Solaris) contents can be freed */ 36#define MADV_FREE 0x5 /* (Solaris) contents can be freed */
37 37
38#ifdef __KERNEL__
39#ifndef __ASSEMBLY__
40#define arch_mmap_check sparc_mmap_check
41int sparc_mmap_check(unsigned long addr, unsigned long len,
42 unsigned long flags);
43#endif
44#endif
45
38#endif /* __SPARC_MMAN_H__ */ 46#endif /* __SPARC_MMAN_H__ */