diff options
| author |   Russell King <rmk+kernel@armlinux.org.uk> | 2017-07-05 11:06:59 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2017-07-05 11:06:59 +0100 |
| commit | 98becb781e3e27d74efe5f3653b948d39f694cfb (patch) | |
| tree | 63d7bcd1ab22c73fb2ecd1670e6bc5c67f6ab560 /arch/x86 | |
| parent | ARM: 8685/1: ensure memblock-limit is pmd-aligned (diff) | |
| parent | ARM: 8684/1: NOMMU: Remove unused KTHREAD_SIZE definition (diff) | |
| download | linux-dev-98becb781e3e27d74efe5f3653b948d39f694cfb.tar.xz linux-dev-98becb781e3e27d74efe5f3653b948d39f694cfb.zip | |
Merge branches 'fixes' and 'misc' into for-linus
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/entry/vdso/vma.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/entry/vdso/vma.c b/arch/x86/entry/vdso/vma.c index 139ad7726e10..726355ce8497 100644 --- a/arch/x86/entry/vdso/vma.c +++ b/arch/x86/entry/vdso/vma.c @@ -78,9 +78,6 @@ static int vdso_mremap(const struct vm_special_mapping *sm, if (image->size != new_size) return -EINVAL; - if (WARN_ON_ONCE(current->mm != new_vma->vm_mm)) - return -EFAULT; - vdso_fix_landing(image, new_vma); current->mm->context.vdso = (void __user *)new_vma->vm_start; |