commit 19abb7023496da7b6559a897dfda798ddb609cd6
Author: Jan Rękorajski <[email protected]>
Date: Sat Dec 28 00:34:46 2024 +0100
- 5.15.175
kernel-aufs5.patch | 18 +++++++++---------
kernel.spec | 4 ++--
2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 49179952..5bd24752 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@
%define rel 1
%define basever 5.15
-%define postver .173
+%define postver .175
# define this to '-%{basever}' for longterm branch
%define versuffix -%{basever}
@@ -121,7 +121,7 @@ Source0:
https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
# Source0-md5: 071d49ff4e020d58c04f9f3f76d3b594
%if "%{postver}" != ".0"
Patch0:
https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5: 95b49a93659187e13c4592ebb16ce371
+# Patch0-md5: 37aaea17432b1137b6a25d1d00a4bb6b
%endif
Source1: kernel.sysconfig
diff --git a/kernel-aufs5.patch b/kernel-aufs5.patch
index c0cd2942..31de5045 100644
--- a/kernel-aufs5.patch
+++ b/kernel-aufs5.patch
@@ -448,8 +448,8 @@ index 6bb553ed5c55..3f9d6d155171 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -183,7 +183,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);
@@ -466,9 +466,9 @@ index 6bb553ed5c55..3f9d6d155171 100644
if (next->anon_vma)
anon_vma_merge(vma, next);
@@ -1880,7 +1880,7 @@ close_and_free_vma:
- if (vma->vm_ops && vma->vm_ops->close)
- vma->vm_ops->close(vma);
- unmap_and_free_vma:
+ return addr;
+
+ unmap_and_free_file_vma:
- fput(vma->vm_file);
+ vma_fput(vma);
vma->vm_file = NULL;
@@ -484,8 +484,8 @@ index 6bb553ed5c55..3f9d6d155171 100644
if (new->vm_ops && new->vm_ops->open)
new->vm_ops->open(new);
@@ -2742,7 +2742,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);
@@ -560,8 +560,8 @@ index 02d2427b8f9e..a7419302ab4e 100644
/* IO memory and memory shared directly out of the pagecache
* from ramfs/tmpfs mustn't be released here */
@@ -655,7 +655,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/19abb7023496da7b6559a897dfda798ddb609cd6
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
