diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-03-30 08:47:19 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-03-30 08:50:06 +0200 |
| commit | 186e54cbe1145f4d11e32fe10e7e20a11f1b27dd (patch) | |
| tree | 9b6cf3667a3ea90e0cec0ea7119688ba76c55a71 /arch/x86/um/vdso/vma.c | |
| parent | x86: Preserve lazy irq disable semantics in fixup_irqs() (diff) | |
| parent | Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-186e54cbe1145f4d11e32fe10e7e20a11f1b27dd.tar.xz linux-186e54cbe1145f4d11e32fe10e7e20a11f1b27dd.zip | |
Merge branch 'linus' into x86/urgent
Merge reason: Needed for include file dependencies.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/um/vdso/vma.c')
| -rw-r--r-- | arch/x86/um/vdso/vma.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/um/vdso/vma.c b/arch/x86/um/vdso/vma.c index 91f4ec9a0a56..af91901babb8 100644 --- a/arch/x86/um/vdso/vma.c +++ b/arch/x86/um/vdso/vma.c @@ -64,8 +64,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) err = install_special_mapping(mm, um_vdso_addr, PAGE_SIZE, VM_READ|VM_EXEC| - VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC| - VM_ALWAYSDUMP, + VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC, vdsop); up_write(&mm->mmap_sem); |