diff options
| author | Linus Torvalds | 2021-07-23 10:14:56 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2021-07-23 10:14:56 -0700 |
| commit | 8072911b2fc3fc4b94d1d44063cf55cbbea1fb49 (patch) | |
| tree | eebf464443e179bf4026a8db83b0c6e4f335dc3a /arch | |
| parent | 74738c556db6c7f780a8b98340937e55b72c896a (diff) | |
| parent | c453db6cd96418c79702eaf38259002755ab23ff (diff) | |
Merge tag 'char-misc-5.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc fixes from Greg KH:
"Here are some small char/misc driver fixes for 5.14-rc3.
Included in here are:
- MAINTAINERS file updates for two changes in different driver
subsystems
- mhi bus bugfixes
- nds32 bugfix that resolves a reported problem
All have been in linux-next with no reported problems"
* tag 'char-misc-5.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
nds32: fix up stack guard gap
MAINTAINERS: Change ACRN HSM driver maintainer
MAINTAINERS: Update for VMCI driver
bus: mhi: pci_generic: Fix inbound IPCR channel
bus: mhi: core: Validate channel ID when processing command completions
bus: mhi: pci_generic: Apply no-op for wake using sideband wake boolean
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/nds32/mm/mmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/nds32/mm/mmap.c b/arch/nds32/mm/mmap.c index c206b31ce07a..1bdf5e7d1b43 100644 --- a/arch/nds32/mm/mmap.c +++ b/arch/nds32/mm/mmap.c @@ -59,7 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, vma = find_vma(mm, addr); if (TASK_SIZE - len >= addr && - (!vma || addr + len <= vma->vm_start)) + (!vma || addr + len <= vm_start_gap(vma))) return addr; } |