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-ia64/mman.h | |
parent | [PATCH] pata_amd: Check enable bits on Nvidia (diff) | |
parent | Merge branch 'audit.b28' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current (diff) | |
download | linux-dev-97148ba2235e334e57d05fa07045cf3e6629763c.tar.xz linux-dev-97148ba2235e334e57d05fa07045cf3e6629763c.zip |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-ia64/mman.h')
-rw-r--r-- | include/asm-ia64/mman.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-ia64/mman.h b/include/asm-ia64/mman.h index 6ba179f12718..c73b87832a1e 100644 --- a/include/asm-ia64/mman.h +++ b/include/asm-ia64/mman.h @@ -22,4 +22,12 @@ #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 */ |