Commit e10a4437 authored by Robert P. J. Day's avatar Robert P. J. Day Committed by Linus Torvalds

[PATCH] Remove final references to deprecated "MAP_ANON" page protection flag

Remove the last vestiges of the long-deprecated "MAP_ANON" page protection
flag: use "MAP_ANONYMOUS" instead.
Signed-off-by: default avatarRobert P. J. Day <rpjday@mindspring.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7c5cae36
...@@ -132,7 +132,7 @@ static int aio_setup_ring(struct kioctx *ctx) ...@@ -132,7 +132,7 @@ static int aio_setup_ring(struct kioctx *ctx)
dprintk("attempting mmap of %lu bytes\n", info->mmap_size); dprintk("attempting mmap of %lu bytes\n", info->mmap_size);
down_write(&ctx->mm->mmap_sem); down_write(&ctx->mm->mmap_sem);
info->mmap_base = do_mmap(NULL, 0, info->mmap_size, info->mmap_base = do_mmap(NULL, 0, info->mmap_size,
PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE,
0); 0);
if (IS_ERR((void *)info->mmap_base)) { if (IS_ERR((void *)info->mmap_base)) {
up_write(&ctx->mm->mmap_sem); up_write(&ctx->mm->mmap_sem);
......
...@@ -372,7 +372,7 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm, ...@@ -372,7 +372,7 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm,
down_write(&current->mm->mmap_sem); down_write(&current->mm->mmap_sem);
current->mm->start_brk = do_mmap(NULL, 0, stack_size, current->mm->start_brk = do_mmap(NULL, 0, stack_size,
PROT_READ | PROT_WRITE | PROT_EXEC, PROT_READ | PROT_WRITE | PROT_EXEC,
MAP_PRIVATE | MAP_ANON | MAP_GROWSDOWN, MAP_PRIVATE | MAP_ANONYMOUS | MAP_GROWSDOWN,
0); 0);
if (IS_ERR_VALUE(current->mm->start_brk)) { if (IS_ERR_VALUE(current->mm->start_brk)) {
......
...@@ -49,7 +49,6 @@ ...@@ -49,7 +49,6 @@
#define MADV_DOFORK 11 /* do inherit across fork */ #define MADV_DOFORK 11 /* do inherit across fork */
/* compatibility flags */ /* compatibility flags */
#define MAP_ANON MAP_ANONYMOUS
#define MAP_FILE 0 #define MAP_FILE 0
#endif /* __ALPHA_MMAN_H__ */ #endif /* __ALPHA_MMAN_H__ */
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#define MADV_DOFORK 11 /* do inherit across fork */ #define MADV_DOFORK 11 /* do inherit across fork */
/* compatibility flags */ /* compatibility flags */
#define MAP_ANON MAP_ANONYMOUS
#define MAP_FILE 0 #define MAP_FILE 0
#endif #endif
...@@ -72,7 +72,6 @@ ...@@ -72,7 +72,6 @@
#define MADV_DOFORK 11 /* do inherit across fork */ #define MADV_DOFORK 11 /* do inherit across fork */
/* compatibility flags */ /* compatibility flags */
#define MAP_ANON MAP_ANONYMOUS
#define MAP_FILE 0 #define MAP_FILE 0
#endif /* _ASM_MMAN_H */ #endif /* _ASM_MMAN_H */
...@@ -55,7 +55,6 @@ ...@@ -55,7 +55,6 @@
#define MADV_64M_PAGES 26 /* Use 64 Megabyte pages */ #define MADV_64M_PAGES 26 /* Use 64 Megabyte pages */
/* compatibility flags */ /* compatibility flags */
#define MAP_ANON MAP_ANONYMOUS
#define MAP_FILE 0 #define MAP_FILE 0
#define MAP_VARIABLE 0 #define MAP_VARIABLE 0
......
...@@ -79,7 +79,6 @@ ...@@ -79,7 +79,6 @@
#define MADV_DOFORK 11 /* do inherit across fork */ #define MADV_DOFORK 11 /* do inherit across fork */
/* compatibility flags */ /* compatibility flags */
#define MAP_ANON MAP_ANONYMOUS
#define MAP_FILE 0 #define MAP_FILE 0
#endif /* _XTENSA_MMAN_H */ #endif /* _XTENSA_MMAN_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment