[packages/kernel/LINUX_4_4] - up to 4.4.188
arekm
arekm at pld-linux.org
Tue Aug 6 23:41:15 CEST 2019
commit 7c48c125135ea3028876946b292244f2d1d9cd2b
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Aug 6 23:41:06 2019 +0200
- up to 4.4.188
kernel-vserver-2.3.patch | 10 +++++++---
kernel.spec | 4 ++--
2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 98f2cf2b..72145276 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -72,7 +72,7 @@
%define rel 1
%define basever 4.4
-%define postver .187
+%define postver .188
# define this to '-%{basever}' for longterm branch
%define versuffix -%{basever}
@@ -124,7 +124,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
# Source0-md5: 9a78fa2eb6c68ca5a40ed5af08142599
%if "%{postver}" != ".0"
Patch0: http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5: 2381f70f5377104567413788ca9f3bf1
+# Patch0-md5: f673cf743ed9c5ad805bffcf39a10e99
%endif
Source1: kernel.sysconfig
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 69d9d585..cf828c8b 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -12751,12 +12751,16 @@ diff -NurpP --minimal linux-4.4.161/ipc/mqueue.c linux-4.4.161-vs2.3.9.8/ipc/mqu
} else if (S_ISDIR(mode)) {
inc_nlink(inode);
/* Some things misbehave if size == 0 on a directory */
-@@ -398,8 +406,11 @@ static void mqueue_evict_inode(struct in
-
+@@ -402,6 +402,7 @@ static void mqueue_evict_inode(struct in
user = info->user;
if (user) {
+ unsigned long mq_bytes, mq_treesize;
+ struct vx_info *vxi = info->vxi;
-+
+
+ /* Total amount of bytes accounted for the mqueue */
+ mq_treesize = info->attr.mq_maxmsg * sizeof(struct msg_msg) +
+@@ -413,6 +414,7 @@ static void mqueue_evict_inode(struct in
+
spin_lock(&mq_lock);
user->mq_bytes -= mq_bytes;
+ vx_ipcmsg_sub(vxi, user, mq_bytes);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/7c48c125135ea3028876946b292244f2d1d9cd2b
More information about the pld-cvs-commit
mailing list