diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-08 21:17:25 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-08 21:17:25 +0200 |
| commit | 09b56d5a418b7ced4ca427c7cf8faf11df72364c (patch) | |
| tree | 88ad1fe20f8fd7df89131cef5c7f8ef96f15406d /arch/x86/entry | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next (diff) | |
| parent | Merge branches 'fixes' and 'misc' into for-linus (diff) | |
| download | linux-09b56d5a418b7ced4ca427c7cf8faf11df72364c.tar.xz linux-09b56d5a418b7ced4ca427c7cf8faf11df72364c.zip | |
Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM updates from Russell King:
- add support for ftrace-with-registers, which is needed for kgraft and
other ftrace tools
- support for mremap() for the sigpage/vDSO so that checkpoint/restore
can work
- add timestamps to each line of the register dump output
- remove the unused KTHREAD_SIZE from nommu
- align the ARM bitops APIs with the generic API (using unsigned long
pointers rather than void pointers)
- make the configuration of userspace Thumb support an expert option so
that we can default it on, and avoid some hard to debug userspace
crashes
* 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: 8684/1: NOMMU: Remove unused KTHREAD_SIZE definition
ARM: 8683/1: ARM32: Support mremap() for sigpage/vDSO
ARM: 8679/1: bitops: Align prototypes to generic API
ARM: 8678/1: ftrace: Adds support for CONFIG_DYNAMIC_FTRACE_WITH_REGS
ARM: make configuration of userspace Thumb support an expert option
ARM: 8673/1: Fix __show_regs output timestamps
Diffstat (limited to 'arch/x86/entry')
| -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; |