commit f3962a6f1bf156941a21badcbd39e47ac1a4bd06
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Sat Dec 28 00:38:50 2024 +0100
- 5.10.232
kernel-aufs5.patch | 18 +++++++++---------
kernel.spec | 4 ++--
2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index f52a104b..91c6649f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -73,7 +73,7 @@
%define rel 1
%define basever 5.10
-%define postver .230
+%define postver .232
# define this to '-%{basever}' for longterm branch
%define versuffix -%{basever}
@@ -127,7 +127,7 @@ Source0:
https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
# Source0-md5: 753adc474bf799d569dec4f165ed92c3
%if "%{postver}" != ".0"
Patch0:
https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5: 998099f115bca6caf19710a693024b66
+# Patch0-md5: 5e4b83f5eff8bca2da60e4d892ebed6d
%endif
Source1: kernel.sysconfig
diff --git a/kernel-aufs5.patch b/kernel-aufs5.patch
index 734e2e0a..e12feae8 100644
--- a/kernel-aufs5.patch
+++ b/kernel-aufs5.patch
@@ -456,8 +456,8 @@ index a1ee93f55ceb..2baefbc409b4 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -179,7 +179,7 @@ static struct vm_area_struct *remove_vma(struct
vm_area_struct *vma)
- if (vma->vm_ops && vma->vm_ops->close)
- vma->vm_ops->close(vma);
+ might_sleep();
+ vma_close(vma);
if (vma->vm_file)
- fput(vma->vm_file);
+ vma_fput(vma);
@@ -483,9 +483,9 @@ index a1ee93f55ceb..2baefbc409b4 100644
vma = merge;
/* Update vm_flags to pick up the change. */
@@ -1901,8 +1901,8 @@ unsigned long mmap_region(struct file *file, unsigned
long addr,
- if (vma->vm_ops && vma->vm_ops->close)
- vma->vm_ops->close(vma);
- unmap_and_free_vma:
+ return addr;
+
+ unmap_and_free_file_vma:
+ vma_fput(vma);
vma->vm_file = NULL;
- fput(file);
@@ -502,8 +502,8 @@ index a1ee93f55ceb..2baefbc409b4 100644
if (new->vm_ops && new->vm_ops->open)
new->vm_ops->open(new);
@@ -2771,7 +2771,7 @@ int __split_vma(struct mm_struct *mm, struct
vm_area_struct *vma,
- if (new->vm_ops && new->vm_ops->close)
- new->vm_ops->close(new);
+ /* Clean everything up if vma_adjust failed. */
+ vma_close(new);
if (new->vm_file)
- fput(new->vm_file);
+ vma_fput(new);
@@ -578,8 +578,8 @@ index 0faf39b32cdb..78ecad7204c8 100644
/* IO memory and memory shared directly out of the pagecache
* from ramfs/tmpfs mustn't be released here */
@@ -665,7 +665,7 @@ static void delete_vma(struct mm_struct *mm, struct
vm_area_struct *vma)
- if (vma->vm_ops && vma->vm_ops->close)
- vma->vm_ops->close(vma);
+ {
+ vma_close(vma);
if (vma->vm_file)
- fput(vma->vm_file);
+ vma_fput(vma);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/f3962a6f1bf156941a21badcbd39e47ac1a4bd06
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
