diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-12 18:03:21 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-12 18:03:21 +0200 |
| commit | 97148ba2235e334e57d05fa07045cf3e6629763c (patch) | |
| tree | a04504e7d4feb0dacfe1862a59abecaf99997f09 /include/asm-ia64 | |
| 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/vir... (diff) | |
| download | linux-97148ba2235e334e57d05fa07045cf3e6629763c.tar.xz linux-97148ba2235e334e57d05fa07045cf3e6629763c.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-ia64')
| -rw-r--r-- | include/asm-ia64/mman.h | 8 | ||||
| -rw-r--r-- | include/asm-ia64/unistd.h | 3 |
2 files changed, 9 insertions, 2 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 */ diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h index bb0eb727dcd0..f581662c5ab8 100644 --- a/include/asm-ia64/unistd.h +++ b/include/asm-ia64/unistd.h @@ -286,8 +286,7 @@ /* 1294, 1295 reserved for pselect/ppoll */ #define __NR_unshare 1296 #define __NR_splice 1297 -#define __NR_set_robust_list 1298 -#define __NR_get_robust_list 1299 +/* 1298, 1299 reserved for set_robust_list/get_robust_list */ #define __NR_sync_file_range 1300 #define __NR_tee 1301 #define __NR_vmsplice 1302 |