summaryrefslogtreecommitdiffstats
path: root/source/k
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2024-02-08 22:17:18 +0000
committer Eric Hameleers <alien@slackware.com>2024-02-09 00:47:38 +0100
commit75fbe2b8aac2aab05665c458fe744855f4e55533 (patch)
tree739f8917b920c97918eb9ddc7f064ae47e5d224b /source/k
parentdc74348a7fbc54e5422f2f1cdff93777bb631feb (diff)
downloadcurrent-75fbe2b8aac2aab05665c458fe744855f4e55533.tar.gz
current-75fbe2b8aac2aab05665c458fe744855f4e55533.tar.xz
Thu Feb 8 22:17:18 UTC 202420240208221718
a/kernel-firmware-20240208_fbef4d3-noarch-1.txz: Upgraded. a/kernel-generic-6.6.16-x86_64-1.txz: Upgraded. a/kernel-huge-6.6.16-x86_64-1.txz: Upgraded. a/kernel-modules-6.6.16-x86_64-1.txz: Upgraded. d/kernel-headers-6.6.16-x86-1.txz: Upgraded. k/kernel-source-6.6.16-noarch-1.txz: Upgraded. -VIDEO_ATOMISP m -VIDEO_ATOMISP_GC0310 n -VIDEO_ATOMISP_GC2235 n -VIDEO_ATOMISP_ISP2401 n -VIDEO_ATOMISP_LM3554 n -VIDEO_ATOMISP_MSRLIST_HELPER n -VIDEO_ATOMISP_MT9M114 n -VIDEO_ATOMISP_OV2722 n -VIDEO_ATOMISP_OV5693 n INTEL_ATOMISP y -> n +INTEL_ATOMISP2_PM m l/enchant-2.6.7-x86_64-1.txz: Upgraded. l/libsecret-0.21.3-x86_64-1.txz: Upgraded. l/libuv-1.48.0-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. testing/packages/rust-1.76.0-x86_64-1.txz: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/k')
-rw-r--r--source/k/kernel-configs/config-generic-6.6.16 (renamed from source/k/kernel-configs/config-generic-6.6.15)17
-rw-r--r--source/k/kernel-configs/config-generic-6.6.16.x64 (renamed from source/k/kernel-configs/config-generic-6.6.15.x64)17
-rw-r--r--source/k/kernel-configs/config-huge-6.6.16 (renamed from source/k/kernel-configs/config-huge-6.6.15)17
-rw-r--r--source/k/kernel-configs/config-huge-6.6.16.x64 (renamed from source/k/kernel-configs/config-huge-6.6.15.x64)17
-rw-r--r--source/k/patches-i686/31e97d7c9ae3de072d7b424b2cf706a03ec10720.patch60
-rw-r--r--source/k/patches-i686/README3
6 files changed, 75 insertions, 56 deletions
diff --git a/source/k/kernel-configs/config-generic-6.6.15 b/source/k/kernel-configs/config-generic-6.6.16
index ad2291e54..a88dbf2c7 100644
--- a/source/k/kernel-configs/config-generic-6.6.15
+++ b/source/k/kernel-configs/config-generic-6.6.16
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.15 Kernel Configuration
+# Linux/x86 6.6.16 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
@@ -4238,7 +4238,6 @@ CONFIG_TOUCHSCREEN_PENMOUNT=m
CONFIG_TOUCHSCREEN_EDT_FT5X06=m
CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
CONFIG_TOUCHSCREEN_PIXCIR=m
CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
CONFIG_TOUCHSCREEN_WM97XX=m
@@ -5436,7 +5435,6 @@ CONFIG_MFD_SM501=m
# CONFIG_MFD_SM501_GPIO is not set
CONFIG_MFD_SKY81452=m
CONFIG_MFD_SYSCON=y
-CONFIG_MFD_TI_AM335X_TSCADC=m
CONFIG_MFD_LP3943=m
CONFIG_MFD_TI_LMU=m
CONFIG_TPS6105X=m
@@ -8636,16 +8634,7 @@ CONFIG_AD5933=m
CONFIG_FB_SM750=m
CONFIG_STAGING_MEDIA=y
-CONFIG_INTEL_ATOMISP=y
-CONFIG_VIDEO_ATOMISP=m
-# CONFIG_VIDEO_ATOMISP_ISP2401 is not set
-# CONFIG_VIDEO_ATOMISP_OV2722 is not set
-# CONFIG_VIDEO_ATOMISP_GC2235 is not set
-# CONFIG_VIDEO_ATOMISP_MSRLIST_HELPER is not set
-# CONFIG_VIDEO_ATOMISP_MT9M114 is not set
-# CONFIG_VIDEO_ATOMISP_GC0310 is not set
-# CONFIG_VIDEO_ATOMISP_OV5693 is not set
-# CONFIG_VIDEO_ATOMISP_LM3554 is not set
+# CONFIG_INTEL_ATOMISP is not set
# CONFIG_DVB_AV7110 is not set
# CONFIG_VIDEO_IPU3_IMGU is not set
# CONFIG_STAGING_MEDIA_DEPRECATED is not set
@@ -8769,6 +8758,7 @@ CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
CONFIG_THINKPAD_LMI=m
CONFIG_INTEL_ATOMISP2_PDX86=y
CONFIG_INTEL_ATOMISP2_LED=m
+CONFIG_INTEL_ATOMISP2_PM=m
# CONFIG_INTEL_SAR_INT1092 is not set
CONFIG_INTEL_SKL_INT3472=m
CONFIG_INTEL_PMC_CORE=y
@@ -9126,7 +9116,6 @@ CONFIG_TI_ADS8344=m
CONFIG_TI_ADS8688=m
CONFIG_TI_ADS124S08=m
# CONFIG_TI_ADS131E08 is not set
-CONFIG_TI_AM335X_ADC=m
CONFIG_TI_LMP92064=m
# CONFIG_TI_TLC4541 is not set
CONFIG_TI_TSC2046=m
diff --git a/source/k/kernel-configs/config-generic-6.6.15.x64 b/source/k/kernel-configs/config-generic-6.6.16.x64
index 512a02d1b..9eaa2a9ee 100644
--- a/source/k/kernel-configs/config-generic-6.6.15.x64
+++ b/source/k/kernel-configs/config-generic-6.6.16.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.15 Kernel Configuration
+# Linux/x86 6.6.16 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
@@ -4282,7 +4282,6 @@ CONFIG_TOUCHSCREEN_PENMOUNT=m
CONFIG_TOUCHSCREEN_EDT_FT5X06=m
CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
CONFIG_TOUCHSCREEN_PIXCIR=m
CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
CONFIG_TOUCHSCREEN_WM97XX=m
@@ -5451,7 +5450,6 @@ CONFIG_MFD_SM501=m
# CONFIG_MFD_SM501_GPIO is not set
CONFIG_MFD_SKY81452=m
CONFIG_MFD_SYSCON=y
-CONFIG_MFD_TI_AM335X_TSCADC=m
CONFIG_MFD_LP3943=m
CONFIG_MFD_TI_LMU=m
CONFIG_TPS6105X=m
@@ -8614,16 +8612,7 @@ CONFIG_AD5933=m
CONFIG_FB_SM750=m
CONFIG_STAGING_MEDIA=y
-CONFIG_INTEL_ATOMISP=y
-CONFIG_VIDEO_ATOMISP=m
-# CONFIG_VIDEO_ATOMISP_ISP2401 is not set
-# CONFIG_VIDEO_ATOMISP_OV2722 is not set
-# CONFIG_VIDEO_ATOMISP_GC2235 is not set
-# CONFIG_VIDEO_ATOMISP_MSRLIST_HELPER is not set
-# CONFIG_VIDEO_ATOMISP_MT9M114 is not set
-# CONFIG_VIDEO_ATOMISP_GC0310 is not set
-# CONFIG_VIDEO_ATOMISP_OV5693 is not set
-# CONFIG_VIDEO_ATOMISP_LM3554 is not set
+# CONFIG_INTEL_ATOMISP is not set
# CONFIG_DVB_AV7110 is not set
# CONFIG_VIDEO_IPU3_IMGU is not set
# CONFIG_STAGING_MEDIA_DEPRECATED is not set
@@ -8748,6 +8737,7 @@ CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
CONFIG_THINKPAD_LMI=m
CONFIG_INTEL_ATOMISP2_PDX86=y
CONFIG_INTEL_ATOMISP2_LED=m
+CONFIG_INTEL_ATOMISP2_PM=m
CONFIG_INTEL_IFS=m
# CONFIG_INTEL_SAR_INT1092 is not set
CONFIG_INTEL_SKL_INT3472=m
@@ -9135,7 +9125,6 @@ CONFIG_TI_ADS8344=m
CONFIG_TI_ADS8688=m
CONFIG_TI_ADS124S08=m
# CONFIG_TI_ADS131E08 is not set
-CONFIG_TI_AM335X_ADC=m
CONFIG_TI_LMP92064=m
# CONFIG_TI_TLC4541 is not set
CONFIG_TI_TSC2046=m
diff --git a/source/k/kernel-configs/config-huge-6.6.15 b/source/k/kernel-configs/config-huge-6.6.16
index 53ff67429..c0f4f2d0c 100644
--- a/source/k/kernel-configs/config-huge-6.6.15
+++ b/source/k/kernel-configs/config-huge-6.6.16
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.15 Kernel Configuration
+# Linux/x86 6.6.16 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
@@ -4238,7 +4238,6 @@ CONFIG_TOUCHSCREEN_PENMOUNT=m
CONFIG_TOUCHSCREEN_EDT_FT5X06=m
CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
CONFIG_TOUCHSCREEN_PIXCIR=m
CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
CONFIG_TOUCHSCREEN_WM97XX=m
@@ -5436,7 +5435,6 @@ CONFIG_MFD_SM501=m
# CONFIG_MFD_SM501_GPIO is not set
CONFIG_MFD_SKY81452=m
CONFIG_MFD_SYSCON=y
-CONFIG_MFD_TI_AM335X_TSCADC=m
CONFIG_MFD_LP3943=m
CONFIG_MFD_TI_LMU=m
CONFIG_TPS6105X=m
@@ -8636,16 +8634,7 @@ CONFIG_AD5933=m
CONFIG_FB_SM750=m
CONFIG_STAGING_MEDIA=y
-CONFIG_INTEL_ATOMISP=y
-CONFIG_VIDEO_ATOMISP=m
-# CONFIG_VIDEO_ATOMISP_ISP2401 is not set
-# CONFIG_VIDEO_ATOMISP_OV2722 is not set
-# CONFIG_VIDEO_ATOMISP_GC2235 is not set
-# CONFIG_VIDEO_ATOMISP_MSRLIST_HELPER is not set
-# CONFIG_VIDEO_ATOMISP_MT9M114 is not set
-# CONFIG_VIDEO_ATOMISP_GC0310 is not set
-# CONFIG_VIDEO_ATOMISP_OV5693 is not set
-# CONFIG_VIDEO_ATOMISP_LM3554 is not set
+# CONFIG_INTEL_ATOMISP is not set
# CONFIG_DVB_AV7110 is not set
# CONFIG_VIDEO_IPU3_IMGU is not set
# CONFIG_STAGING_MEDIA_DEPRECATED is not set
@@ -8769,6 +8758,7 @@ CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
CONFIG_THINKPAD_LMI=m
CONFIG_INTEL_ATOMISP2_PDX86=y
CONFIG_INTEL_ATOMISP2_LED=m
+CONFIG_INTEL_ATOMISP2_PM=m
# CONFIG_INTEL_SAR_INT1092 is not set
CONFIG_INTEL_SKL_INT3472=m
CONFIG_INTEL_PMC_CORE=y
@@ -9126,7 +9116,6 @@ CONFIG_TI_ADS8344=m
CONFIG_TI_ADS8688=m
CONFIG_TI_ADS124S08=m
# CONFIG_TI_ADS131E08 is not set
-CONFIG_TI_AM335X_ADC=m
CONFIG_TI_LMP92064=m
# CONFIG_TI_TLC4541 is not set
CONFIG_TI_TSC2046=m
diff --git a/source/k/kernel-configs/config-huge-6.6.15.x64 b/source/k/kernel-configs/config-huge-6.6.16.x64
index ec5116aa6..d974af92a 100644
--- a/source/k/kernel-configs/config-huge-6.6.15.x64
+++ b/source/k/kernel-configs/config-huge-6.6.16.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.15 Kernel Configuration
+# Linux/x86 6.6.16 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
@@ -4282,7 +4282,6 @@ CONFIG_TOUCHSCREEN_PENMOUNT=m
CONFIG_TOUCHSCREEN_EDT_FT5X06=m
CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
CONFIG_TOUCHSCREEN_PIXCIR=m
CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
CONFIG_TOUCHSCREEN_WM97XX=m
@@ -5451,7 +5450,6 @@ CONFIG_MFD_SM501=m
# CONFIG_MFD_SM501_GPIO is not set
CONFIG_MFD_SKY81452=m
CONFIG_MFD_SYSCON=y
-CONFIG_MFD_TI_AM335X_TSCADC=m
CONFIG_MFD_LP3943=m
CONFIG_MFD_TI_LMU=m
CONFIG_TPS6105X=m
@@ -8614,16 +8612,7 @@ CONFIG_AD5933=m
CONFIG_FB_SM750=m
CONFIG_STAGING_MEDIA=y
-CONFIG_INTEL_ATOMISP=y
-CONFIG_VIDEO_ATOMISP=m
-# CONFIG_VIDEO_ATOMISP_ISP2401 is not set
-# CONFIG_VIDEO_ATOMISP_OV2722 is not set
-# CONFIG_VIDEO_ATOMISP_GC2235 is not set
-# CONFIG_VIDEO_ATOMISP_MSRLIST_HELPER is not set
-# CONFIG_VIDEO_ATOMISP_MT9M114 is not set
-# CONFIG_VIDEO_ATOMISP_GC0310 is not set
-# CONFIG_VIDEO_ATOMISP_OV5693 is not set
-# CONFIG_VIDEO_ATOMISP_LM3554 is not set
+# CONFIG_INTEL_ATOMISP is not set
# CONFIG_DVB_AV7110 is not set
# CONFIG_VIDEO_IPU3_IMGU is not set
# CONFIG_STAGING_MEDIA_DEPRECATED is not set
@@ -8748,6 +8737,7 @@ CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
CONFIG_THINKPAD_LMI=m
CONFIG_INTEL_ATOMISP2_PDX86=y
CONFIG_INTEL_ATOMISP2_LED=m
+CONFIG_INTEL_ATOMISP2_PM=m
CONFIG_INTEL_IFS=m
# CONFIG_INTEL_SAR_INT1092 is not set
CONFIG_INTEL_SKL_INT3472=m
@@ -9135,7 +9125,6 @@ CONFIG_TI_ADS8344=m
CONFIG_TI_ADS8688=m
CONFIG_TI_ADS124S08=m
# CONFIG_TI_ADS131E08 is not set
-CONFIG_TI_AM335X_ADC=m
CONFIG_TI_LMP92064=m
# CONFIG_TI_TLC4541 is not set
CONFIG_TI_TSC2046=m
diff --git a/source/k/patches-i686/31e97d7c9ae3de072d7b424b2cf706a03ec10720.patch b/source/k/patches-i686/31e97d7c9ae3de072d7b424b2cf706a03ec10720.patch
new file mode 100644
index 000000000..bfc7cd804
--- /dev/null
+++ b/source/k/patches-i686/31e97d7c9ae3de072d7b424b2cf706a03ec10720.patch
@@ -0,0 +1,60 @@
+From 31e97d7c9ae3de072d7b424b2cf706a03ec10720 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)
+
+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>
+---
+ drivers/media/pci/solo6x10/solo6x10-offsets.h | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+(limited to 'drivers/media/pci/solo6x10/solo6x10-offsets.h')
+
+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
diff --git a/source/k/patches-i686/README b/source/k/patches-i686/README
new file mode 100644
index 000000000..8fc981b95
--- /dev/null
+++ b/source/k/patches-i686/README
@@ -0,0 +1,3 @@
+Fix extreme memory usage with min/max macros.
+
+This should land in 6.6.17.
generated by cgit v1.2.3-80-g2a13 (git 2.46.2) at 2024-10-31 14:21:24 +0000