- updated to 5.10.230

diff --git a/kernel-x86.config b/kernel-x86.config
index 2ea626f9a39fded9cd746e85ba911b02e40ba528..0d585ecd9abf2a8859bd06fe5aae4b423a5fe95c 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -1,14 +1,14 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.221 Kernel Configuration
+# Linux/x86 5.10.230 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (TLD-Linux) 13.2.0 20240401 (release)"
+CONFIG_CC_VERSION_TEXT="gcc (TLD-Linux) 13.3.0 20240818 (release)"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=130200
-CONFIG_LD_VERSION=242000000
+CONFIG_GCC_VERSION=130300
+CONFIG_LD_VERSION=243010000
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24200
+CONFIG_AS_VERSION=24301
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
@@ -9295,6 +9295,9 @@ CONFIG_ENCRYPTED_KEYS=y
 # CONFIG_KEY_DH_OPERATIONS is not set
 CONFIG_KEY_NOTIFICATIONS=y
 CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_PROC_MEM_ALWAYS_FORCE=y
+# CONFIG_PROC_MEM_FORCE_PTRACE is not set
+# CONFIG_PROC_MEM_NO_FORCE is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y

diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 3ab9ef14238d6803439ae3460a41ea8d698e4f9e..7c5a4328ab9374b1f841c084eb0609216f608441 100644 (file)
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1,14 +1,14 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.221 Kernel Configuration
+# Linux/x86 5.10.230 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (TLD-Linux) 13.2.0 20240401 (release)"
+CONFIG_CC_VERSION_TEXT="gcc (TLD-Linux) 13.3.0 20240818 (release)"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=130200
-CONFIG_LD_VERSION=242000000
+CONFIG_GCC_VERSION=130300
+CONFIG_LD_VERSION=243010000
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24200
+CONFIG_AS_VERSION=24301
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
@@ -9222,6 +9222,9 @@ CONFIG_ENCRYPTED_KEYS=y
 # CONFIG_KEY_DH_OPERATIONS is not set
 CONFIG_KEY_NOTIFICATIONS=y
 CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_PROC_MEM_ALWAYS_FORCE=y
+# CONFIG_PROC_MEM_FORCE_PTRACE is not set
+# CONFIG_PROC_MEM_NO_FORCE is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y

diff --git a/kernel.spec b/kernel.spec
index fa682e6afd7274ac65ab42fa7c39f0154d80c8c0..1d1805ed56dd21d91834797dc7778a883a00864f 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -4,8 +4,8 @@
 %bcond_with    verbose         # verbose build (V=1)
 
 %define                basever         5.10
-%define                postver         223
-%define                rel             2
+%define                postver         230
+%define                rel             1
 
 %define                __alt_kernel    %{nil}
 
@@ -36,11 +36,9 @@ Source0:     http://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
 # Source0-md5: 753adc474bf799d569dec4f165ed92c3
 %if "%{postver}" != "0"
 Source1:       http://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Source1-md5: f1bdf2b7e8cc891000940dc6f7470c52
+# Source1-md5: 998099f115bca6caf19710a693024b66
 %endif
 
-Patch0:                solo6x10_mem_fix.patch
-
 Source2:       kernel-module-build.pl
 Source3:       kernel.make
 
@@ -337,8 +335,6 @@ cd linux-%{basever}
 %{__xz} -dc %{SOURCE1} | patch -p1 -s
 %endif
 
-%patch0 -p1
-
 # Fix EXTRAVERSION in main Makefile
 sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{?alt_kernel:_%{alt_kernel}}#g' Makefile
 

diff --git a/solo6x10_mem_fix.patch b/solo6x10_mem_fix.patch
deleted file mode 100644 (file)
index 57f76a9..0000000
--- a/solo6x10_mem_fix.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 7a62d444a252ea7b95a72172aa0c5e909adcdbf0 Mon Sep 17 00:00:00 2001
-From: Aurelien Jarno <aurelien@aurel32.net>
-Date: Sat, 13 Jan 2024 19:33:31 +0100
-Subject: media: solo6x10: replace max(a, min(b, c)) by clamp(b, a, c)
-
-commit 31e97d7c9ae3de072d7b424b2cf706a03ec10720 upstream.
-
-This patch replaces max(a, min(b, c)) by clamp(b, a, c) in the solo6x10
-driver.  This improves the readability and more importantly, for the
-solo6x10-p2m.c file, this reduces on my system (x86-64, gcc 13):
-
- - the preprocessed size from 121 MiB to 4.5 MiB;
-
- - the build CPU time from 46.8 s to 1.6 s;
-
- - the build memory from 2786 MiB to 98MiB.
-
-In fine, this allows this relatively simple C file to be built on a
-32-bit system.
-
-Reported-by: Jiri Slaby <jirislaby@gmail.com>
-Closes: https://lore.kernel.org/lkml/18c6df0d-45ed-450c-9eda-95160a2bbb8e@gmail.com/
-Cc:  <stable@vger.kernel.org> # v6.7+
-Suggested-by: David Laight <David.Laight@ACULAB.COM>
-Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-Reviewed-by: David Laight <David.Laight@ACULAB.COM>
-Reviewed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Cc: <regressions@leemhuis.info>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/media/pci/solo6x10/solo6x10-offsets.h | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/media/pci/solo6x10/solo6x10-offsets.h b/drivers/media/pci/solo6x10/solo6x10-offsets.h
-index f414ee1316f29c..fdbb817e63601c 100644
---- a/drivers/media/pci/solo6x10/solo6x10-offsets.h
-+++ b/drivers/media/pci/solo6x10/solo6x10-offsets.h
-@@ -57,16 +57,16 @@
- #define SOLO_MP4E_EXT_ADDR(__solo) \
-       (SOLO_EREF_EXT_ADDR(__solo) + SOLO_EREF_EXT_AREA(__solo))
- #define SOLO_MP4E_EXT_SIZE(__solo) \
--      max((__solo->nr_chans * 0x00080000),                            \
--          min(((__solo->sdram_size - SOLO_MP4E_EXT_ADDR(__solo)) -    \
--               __SOLO_JPEG_MIN_SIZE(__solo)), 0x00ff0000))
-+      clamp(__solo->sdram_size - SOLO_MP4E_EXT_ADDR(__solo) - \
-+            __SOLO_JPEG_MIN_SIZE(__solo),                     \
-+            __solo->nr_chans * 0x00080000, 0x00ff0000)
- 
- #define __SOLO_JPEG_MIN_SIZE(__solo)          (__solo->nr_chans * 0x00080000)
- #define SOLO_JPEG_EXT_ADDR(__solo) \
-               (SOLO_MP4E_EXT_ADDR(__solo) + SOLO_MP4E_EXT_SIZE(__solo))
- #define SOLO_JPEG_EXT_SIZE(__solo) \
--      max(__SOLO_JPEG_MIN_SIZE(__solo),                               \
--          min((__solo->sdram_size - SOLO_JPEG_EXT_ADDR(__solo)), 0x00ff0000))
-+      clamp(__solo->sdram_size - SOLO_JPEG_EXT_ADDR(__solo),  \
-+            __SOLO_JPEG_MIN_SIZE(__solo), 0x00ff0000)
- 
- #define SOLO_SDRAM_END(__solo) \
-       (SOLO_JPEG_EXT_ADDR(__solo) + SOLO_JPEG_EXT_SIZE(__solo))
--- 
-cgit 1.2.3-korg
-