diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-06-25 14:09:02 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-06-25 14:09:02 +0200 |
| commit | fa631f2636f732af775bb8575cbbf279cd4ddb0e (patch) | |
| tree | 2e34eec9cca9295e553256161f93ba03626f1b2b | |
| parent | 9304bb8a2ca6a1c4af98bd703e4fcdfa141ab606 (diff) | |
| download | patches-fa631f2636f732af775bb8575cbbf279cd4ddb0e.tar.gz | |
updates
| -rw-r--r-- | 0001-Kbuild-provide-a-common-kernel-installation-script.patch | 2 | ||||
| -rw-r--r-- | nds32-bugfix.patch | 20 | ||||
| -rw-r--r-- | series | 3 |
3 files changed, 23 insertions, 2 deletions
diff --git a/0001-Kbuild-provide-a-common-kernel-installation-script.patch b/0001-Kbuild-provide-a-common-kernel-installation-script.patch index 0dbd744adf46d6..6681fdf6857af4 100644 --- a/0001-Kbuild-provide-a-common-kernel-installation-script.patch +++ b/0001-Kbuild-provide-a-common-kernel-installation-script.patch @@ -649,7 +649,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -done; --- a/arch/riscv/boot/Makefile +++ b/arch/riscv/boot/Makefile -@@ -47,9 +47,9 @@ $(obj)/loader.bin: $(obj)/loader FORCE +@@ -60,9 +60,9 @@ $(obj)/loader.bin: $(obj)/loader FORCE $(call if_changed,objcopy) install: diff --git a/nds32-bugfix.patch b/nds32-bugfix.patch new file mode 100644 index 00000000000000..9e1d429f30fabe --- /dev/null +++ b/nds32-bugfix.patch @@ -0,0 +1,20 @@ +From foo@baz Fri Jun 25 02:01:11 PM CEST 2021 +Date: Fri, 25 Jun 2021 14:01:11 +0200 +To: Greg KH <gregkh@linuxfoundation.org> +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Subject: [PATCH] nds32: bugfix + + +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; + } + @@ -1,6 +1,7 @@ # -0001-Kbuild-provide-a-common-kernel-installation-script.patch 0001-x86-tools-relocs-add-__printf-attribute-to-die.patch +nds32-bugfix.patch +0001-Kbuild-provide-a-common-kernel-installation-script.patch 0001-driver-core-aux-test-code.patch copying.patch 0001-readfile-implement-readfile-syscall.patch |