diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-12 12:03:21 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-12 12:03:21 -0400 |
commit | 97148ba2235e334e57d05fa07045cf3e6629763c (patch) | |
tree | a04504e7d4feb0dacfe1862a59abecaf99997f09 /include/asm-sparc | |
parent | 76ff3c6e3b389a5a7692811dd456e0ff58340cac (diff) | |
parent | 05ff0e291af086f4325bac76abad250690bbbd63 (diff) | |
download | kernel-crypto-97148ba2235e334e57d05fa07045cf3e6629763c.tar.gz kernel-crypto-97148ba2235e334e57d05fa07045cf3e6629763c.tar.xz kernel-crypto-97148ba2235e334e57d05fa07045cf3e6629763c.zip |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-sparc')
-rw-r--r-- | include/asm-sparc/mman.h | 8 |
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 @@ #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__ */ |