commit 6c4388410afcc1d6632cff9f40312d5adb7ec4dc
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Sat Dec 14 12:05:21 2024 +0100
- 6.6.65
kernel-aufs.patch | 26 +++++++++++++-------------
kernel.spec | 4 ++--
2 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 2bffa160..3633d920 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -61,7 +61,7 @@
%define rel 1
%define basever 6.6
-%define postver .61
+%define postver .65
# define this to '-%{basever}' for longterm branch
%define versuffix -%{basever}
@@ -115,7 +115,7 @@ Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz
# Source0-md5: 452098d80ba925af3a4ab35998f3aef5
%if "%{postver}" != ".0"
Patch0:
https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
-# Patch0-md5: 95cb21e66fef5bae10b79fa6b1eef45d
+# Patch0-md5: 9e161fcad508ace5b787fef7be471eb1
%endif
Source1: kernel.sysconfig
diff --git a/kernel-aufs.patch b/kernel-aufs.patch
index fd856a60..9f96cd4f 100644
--- a/kernel-aufs.patch
+++ b/kernel-aufs.patch
@@ -416,8 +416,8 @@ index 9e018d8dd7d6..047bd4a0ced8 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -140,7 +140,7 @@ static void remove_vma(struct vm_area_struct *vma, bool
unreachable)
- 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);
@@ -442,7 +442,7 @@ index 9e018d8dd7d6..047bd4a0ced8 100644
if (new->vm_ops && new->vm_ops->open)
new->vm_ops->open(new);
-@@ -2801,7 +2801,7 @@ unsigned long mmap_region(struct file *file, unsigned
long addr,
+@@ -2801,7 +2801,7 @@ static unsigned long __mmap_region(struct file *file,
unsigned long addr,
* and cause general protection fault
* ultimately.
*/
@@ -451,15 +451,15 @@ index 9e018d8dd7d6..047bd4a0ced8 100644
vm_area_free(vma);
vma = merge;
/* Update vm_flags to pick up the change. */
-@@ -2896,7 +2896,7 @@ unsigned long mmap_region(struct file *file, unsigned
long addr,
+@@ -2896,7 +2896,7 @@ static unsigned long __mmap_region(struct file *file,
unsigned long addr,
+ return addr;
- if (file || vma->vm_file) {
- unmap_and_free_vma:
-- fput(vma->vm_file);
-+ vma_fput(vma);
- vma->vm_file = NULL;
+ unmap_and_free_file_vma:
+- fput(vma->vm_file);
++ vma_fput(vma);
+ vma->vm_file = NULL;
- vma_iter_set(&vmi, vma->vm_end);
+ vma_iter_set(&vmi, vma->vm_end);
@@ -2958,6 +2958,9 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start,
unsigned long, size,
unsigned long populate = 0;
unsigned long ret = -EINVAL;
@@ -522,7 +522,7 @@ index 9e018d8dd7d6..047bd4a0ced8 100644
new_vma->vm_ops->open(new_vma);
if (vma_link(mm, new_vma))
@@ -3384,7 +3411,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct
**vmap,
- new_vma->vm_ops->close(new_vma);
+ vma_close(new_vma);
if (new_vma->vm_file)
- fput(new_vma->vm_file);
@@ -544,8 +544,8 @@ index 7f9e9e5a0e12..69663f2bd4c4 100644
/* IO memory and memory shared directly out of the pagecache
* from ramfs/tmpfs mustn't be released here */
@@ -603,7 +603,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/6c4388410afcc1d6632cff9f40312d5adb7ec4dc
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
