From 5533df08903ff7b0f81d4e327afecea365e7c054 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Wed, 4 Dec 2024 00:56:15 +0100 Subject: [PATCH] - updated to 6.1.119 --- kernel-x86.config | 18 ++++++------ kernel-x86_64.config | 18 ++++++------ kernel.spec | 10 ++----- solo6x10_mem_fix.patch | 63 ------------------------------------------ 4 files changed, 23 insertions(+), 86 deletions(-) delete mode 100644 solo6x10_mem_fix.patch diff --git a/kernel-x86.config b/kernel-x86.config index 070cf2d..35c960b 100644 --- a/kernel-x86.config +++ b/kernel-x86.config @@ -1,19 +1,18 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.105 Kernel Configuration +# Linux/x86 6.1.119 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_GCC_VERSION=130300 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24200 +CONFIG_AS_VERSION=24301 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24200 +CONFIG_LD_VERSION=24301 CONFIG_LLD_VERSION=0 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y -CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=0 @@ -976,10 +975,11 @@ CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo" CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y -# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set +# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED is not set # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud" CONFIG_ZBUD=y +CONFIG_Z3FOLD_DEPRECATED=m CONFIG_Z3FOLD=m CONFIG_ZSMALLOC=m # CONFIG_ZSMALLOC_STAT is not set @@ -8574,7 +8574,6 @@ CONFIG_INTEL_IOMMU=y CONFIG_INTEL_IOMMU_DEFAULT_ON=y CONFIG_INTEL_IOMMU_FLOPPY_WA=y CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON=y -CONFIG_INTEL_IOMMU_PERF_EVENTS=y CONFIG_HYPERV_IOMMU=y CONFIG_VIRTIO_IOMMU=m @@ -9890,6 +9889,9 @@ CONFIG_USER_DECRYPTED_DATA=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 36281c3..253fa20 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -1,21 +1,20 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.105 Kernel Configuration +# Linux/x86 6.1.119 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_GCC_VERSION=130300 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24200 +CONFIG_AS_VERSION=24301 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24200 +CONFIG_LD_VERSION=24301 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y -CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=0 @@ -1009,10 +1008,11 @@ CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo" CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y -# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set +# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED is not set # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud" CONFIG_ZBUD=y +CONFIG_Z3FOLD_DEPRECATED=m CONFIG_Z3FOLD=m CONFIG_ZSMALLOC=m # CONFIG_ZSMALLOC_STAT is not set @@ -8687,7 +8687,6 @@ CONFIG_INTEL_IOMMU_SVM=y CONFIG_INTEL_IOMMU_DEFAULT_ON=y CONFIG_INTEL_IOMMU_FLOPPY_WA=y CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON=y -CONFIG_INTEL_IOMMU_PERF_EVENTS=y CONFIG_IRQ_REMAP=y CONFIG_HYPERV_IOMMU=y CONFIG_VIRTIO_IOMMU=m @@ -10026,6 +10025,9 @@ CONFIG_USER_DECRYPTED_DATA=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 06f2897..85aec63 100644 --- a/kernel.spec +++ b/kernel.spec @@ -4,8 +4,8 @@ %bcond_with verbose # verbose build (V=1) %define basever 6.1 -%define postver 105 -%define rel 2 +%define postver 119 +%define rel 1 %define __alt_kernel %{nil} @@ -36,11 +36,9 @@ Source0: http://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz # Source0-md5: 475320de08f16c9fa486fc4edfe98b30 %if "%{postver}" != "0" Source1: http://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz -# Source1-md5: 2a1ad4249260f5d5567de7dd9ba4e783 +# Source1-md5: 0da46585f753bc463d3b1b8cf39ad174 %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 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 -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 -Closes: https://lore.kernel.org/lkml/18c6df0d-45ed-450c-9eda-95160a2bbb8e@gmail.com/ -Cc: # v6.7+ -Suggested-by: David Laight -Signed-off-by: Aurelien Jarno -Reviewed-by: David Laight -Reviewed-by: Hans Verkuil -Signed-off-by: Linus Torvalds -Cc: -Signed-off-by: Greg Kroah-Hartman ---- - 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 - -- 2.49.0