Drop zram entropy && update config

Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>

3 files changed, 23 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 68628a321f9a..6acf7a12a1c4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = linux-cachyos-cacule
 	pkgdesc = Linux cacULE scheduler Kernel by CachyOS with other patches and improvements
 	pkgver = 6.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/CachyOS/linux-cachyos
 	arch = x86_64
 	arch = x86_64_v3
@@ -28,11 +28,11 @@ pkgbase = linux-cachyos-cacule
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.0/all/0001-cachyos-base-all.patch
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.0/sched/0001-cacULE-cachy.patch
 	sha256sums = 5c2443a5538de52688efb55c27ab0539c1f5eb58c0cfd16a2b9fbb08fd81788e
-	sha256sums = 545f9592ac0bb2959de4799133c53d79c9e2bd3f226804e92693a2e2c20d724a
+	sha256sums = 61479bd23bafaad89512ef9cdd420b40797da40691503ee89ae188cb51bb4924
 	sha256sums = f0e02c04001b39a79344a114daceda589658f79035ad8d912c3d3528c13d35ca
 	sha256sums = e1d45b5842079a5f0f53d7ea2d66ffa3f1497766f3ccffcf13ed00f1ac67f95e
-	sha256sums = 8513b07315568e8c8cdd0790778bda3a4eb5e2cf4f585662fdd8bccbe331a40f
-	sha256sums = eec1684b75918609e707b876e83c6a6570aaddec7ecdb3277a649575550edd46
+	sha256sums = 8180568fa32a598c9643cb757daa4a8b59b4d888917aa086f82f4929dcaea3d5
+	sha256sums = e6146243342077c1c755ed377ebb866cd8f40cbfe7a1a86b7dfbd076151a0b3f
 
 pkgname = linux-cachyos-cacule
 	pkgdesc = The Linux cacULE scheduler Kernel by CachyOS with other patches and improvements kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index eb641dc5a7fd..81b6ab3bf926 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -199,7 +199,7 @@ _stable=${_major}
 _srcname=linux-${_stable}
 #_srcname=linux-${_major}
 pkgdesc='Linux cacULE scheduler Kernel by CachyOS with other patches and improvements'
-pkgrel=1
+pkgrel=2
 _kernver=$pkgver-$pkgrel
 arch=('x86_64' 'x86_64_v3')
 url="https://github.com/CachyOS/linux-cachyos"
@@ -754,9 +754,7 @@ prepare() {
             --set-str ZRAM_DEF_COMP zstd \
             --disable ZSWAP_COMPRESSOR_DEFAULT_LZ4 \
             --enable ZSWAP_COMPRESSOR_DEFAULT_ZSTD \
-            --set-str ZSWAP_COMPRESSOR_DEFAULT zstd \
-            --enable ZRAM_ENTROPY \
-            --set-val ZRAM_ENTROPY_THRESHOLD 100000
+            --set-str ZSWAP_COMPRESSOR_DEFAULT zstd
     fi
 
     ### Selecting the ZSTD modules and kernel compression level
@@ -1023,8 +1021,8 @@ for _p in "${pkgname[@]}"; do
 done
 
 sha256sums=('5c2443a5538de52688efb55c27ab0539c1f5eb58c0cfd16a2b9fbb08fd81788e'
-            '545f9592ac0bb2959de4799133c53d79c9e2bd3f226804e92693a2e2c20d724a'
+            '61479bd23bafaad89512ef9cdd420b40797da40691503ee89ae188cb51bb4924'
             'f0e02c04001b39a79344a114daceda589658f79035ad8d912c3d3528c13d35ca'
             'e1d45b5842079a5f0f53d7ea2d66ffa3f1497766f3ccffcf13ed00f1ac67f95e'
-            '8513b07315568e8c8cdd0790778bda3a4eb5e2cf4f585662fdd8bccbe331a40f'
-            'eec1684b75918609e707b876e83c6a6570aaddec7ecdb3277a649575550edd46')
+            '8180568fa32a598c9643cb757daa4a8b59b4d888917aa086f82f4929dcaea3d5'
+            'e6146243342077c1c755ed377ebb866cd8f40cbfe7a1a86b7dfbd076151a0b3f')
diff --git a/config b/config
index c938a2fde64f..e5f9c5068655 100644
--- a/config
+++ b/config
@@ -13,7 +13,6 @@ CONFIG_LD_VERSION=23900
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
-CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
@@ -204,6 +203,7 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 #
 CONFIG_UCLAMP_TASK=y
 CONFIG_UCLAMP_BUCKETS_COUNT=5
+# CONFIG_SCHED_ALT is not set
 # end of Scheduler features
 
 # CONFIG_CACULE_SCHED is not set
@@ -219,7 +219,7 @@ CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
-CONFIG_CGROUP_FAVOR_DYNMODS=y
+# CONFIG_CGROUP_FAVOR_DYNMODS is not set
 CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG_KMEM=y
@@ -438,7 +438,6 @@ CONFIG_GENERIC_CPU=y
 # CONFIG_MNATIVE_AMD is not set
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_TSC=y
 CONFIG_X86_CMPXCHG64=y
 CONFIG_X86_CMOV=y
@@ -687,7 +686,6 @@ CONFIG_TPS68470_PMIC_OPREGION=y
 CONFIG_ACPI_VIOT=y
 CONFIG_ACPI_PRMT=y
 CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_PRMT=y
 
 #
 # CPU Frequency scaling
@@ -1043,7 +1041,7 @@ CONFIG_BLK_MQ_STACKING=y
 # IO Schedulers
 #
 CONFIG_MQ_IOSCHED_DEADLINE=y
-# CONFIG_MQ_IOSCHED_KYBER is not set
+CONFIG_MQ_IOSCHED_KYBER=y
 CONFIG_IOSCHED_BFQ=y
 CONFIG_BFQ_GROUP_IOSCHED=y
 # CONFIG_BFQ_CGROUP_DEBUG is not set
@@ -1199,8 +1197,6 @@ CONFIG_PTE_MARKER_UFFD_WP=y
 # CONFIG_LRU_GEN is not set
 # CONFIG_LRU_GEN_ENABLED is not set
 # CONFIG_LRU_GEN_STATS is not set
-CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
-# CONFIG_PER_VMA_LOCK is not set
 
 #
 # Data Access Monitoring
@@ -2306,6 +2302,7 @@ CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+CONFIG_HMEM_REPORTING=y
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 CONFIG_SYS_HYPERVISOR=y
 CONFIG_GENERIC_CPU_AUTOPROBE=y
@@ -2370,7 +2367,6 @@ CONFIG_GOOGLE_VPD=m
 #
 # EFI (Extensible Firmware Interface) Support
 #
-# CONFIG_EFI_VARS is not set
 CONFIG_EFI_ESRT=y
 CONFIG_EFI_VARS_PSTORE=y
 CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
@@ -3301,7 +3297,7 @@ CONFIG_ICE_HWTS=y
 CONFIG_FM10K=m
 CONFIG_IGC=m
 CONFIG_NET_VENDOR_WANGXUN=y
-# CONFIG_TXGBE is not set
+CONFIG_TXGBE=m
 CONFIG_JME=m
 CONFIG_NET_VENDOR_LITEX=y
 CONFIG_NET_VENDOR_MARVELL=y
@@ -3561,7 +3557,7 @@ CONFIG_CAN_VXCAN=m
 CONFIG_CAN_NETLINK=y
 CONFIG_CAN_CALC_BITTIMING=y
 CONFIG_CAN_RX_OFFLOAD=y
-# CONFIG_CAN_CAN327 is not set
+CONFIG_CAN_CAN327=m
 CONFIG_CAN_JANZ_ICAN3=m
 CONFIG_CAN_KVASER_PCIEFD=m
 CONFIG_CAN_SLCAN=m
@@ -3607,7 +3603,7 @@ CONFIG_CAN_MCP251XFD=m
 #
 CONFIG_CAN_8DEV_USB=m
 CONFIG_CAN_EMS_USB=m
-# CONFIG_CAN_ESD_USB is not set
+CONFIG_CAN_ESD_USB=m
 CONFIG_CAN_ETAS_ES58X=m
 CONFIG_CAN_GS_USB=m
 CONFIG_CAN_KVASER_USB=m
@@ -4583,7 +4579,7 @@ CONFIG_TCG_TIS_CORE=m
 CONFIG_TCG_TIS=m
 CONFIG_TCG_TIS_SPI=m
 CONFIG_TCG_TIS_SPI_CR50=y
-# CONFIG_TCG_TIS_I2C is not set
+CONFIG_TCG_TIS_I2C=m
 CONFIG_TCG_TIS_I2C_CR50=m
 CONFIG_TCG_TIS_I2C_ATMEL=m
 CONFIG_TCG_TIS_I2C_INFINEON=m
@@ -4841,7 +4837,7 @@ CONFIG_PINCTRL_ICELAKE=y
 CONFIG_PINCTRL_JASPERLAKE=y
 CONFIG_PINCTRL_LAKEFIELD=y
 CONFIG_PINCTRL_LEWISBURG=y
-CONFIG_PINCTRL_METEORLAKE=m
+CONFIG_PINCTRL_METEORLAKE=y
 CONFIG_PINCTRL_SUNRISEPOINT=y
 CONFIG_PINCTRL_TIGERLAKE=y
 # end of Intel pinctrl drivers
@@ -5132,7 +5128,7 @@ CONFIG_SENSORS_DRIVETEMP=m
 CONFIG_SENSORS_DS620=m
 CONFIG_SENSORS_DS1621=m
 CONFIG_SENSORS_DELL_SMM=m
-# CONFIG_I8K is not set
+CONFIG_I8K=y
 CONFIG_SENSORS_DA9052_ADC=m
 CONFIG_SENSORS_DA9055=m
 CONFIG_SENSORS_I5K_AMB=m
@@ -6899,7 +6895,7 @@ CONFIG_SND_CTL_FAST_LOOKUP=y
 CONFIG_SND_DEBUG=y
 # CONFIG_SND_DEBUG_VERBOSE is not set
 # CONFIG_SND_PCM_XRUN_DEBUG is not set
-# CONFIG_SND_CTL_INPUT_VALIDATION is not set
+CONFIG_SND_CTL_INPUT_VALIDATION=y
 # CONFIG_SND_CTL_DEBUG is not set
 # CONFIG_SND_JACK_INJECTION_DEBUG is not set
 CONFIG_SND_VMASTER=y
@@ -9871,7 +9867,7 @@ CONFIG_USB4=m
 #
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ANDROID_BINDERFS=y
-CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
+CONFIG_ANDROID_BINDER_DEVICES=""
 # CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
@@ -9886,6 +9882,8 @@ CONFIG_NVDIMM_DAX=y
 CONFIG_DAX=y
 CONFIG_DEV_DAX=m
 CONFIG_DEV_DAX_PMEM=m
+CONFIG_DEV_DAX_HMEM=m
+CONFIG_DEV_DAX_HMEM_DEVICES=y
 CONFIG_DEV_DAX_KMEM=m
 CONFIG_NVMEM=y
 CONFIG_NVMEM_SYSFS=y
@@ -10871,7 +10869,6 @@ CONFIG_CMA_ALIGNMENT=8
 # CONFIG_DMA_MAP_BENCHMARK is not set
 CONFIG_SGL_ALLOC=y
 CONFIG_CHECK_SIGNATURE=y
-# CONFIG_FORCE_NR_CPUS is not set
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
 CONFIG_GLOB=y
@@ -10910,7 +10907,6 @@ CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
 CONFIG_ARCH_HAS_COPY_MC=y
 CONFIG_ARCH_STACKWALK=y
 CONFIG_STACKDEPOT=y
-CONFIG_STACK_HASH_ORDER=20
 CONFIG_SBITMAP=y
 CONFIG_PARMAN=m
 CONFIG_OBJAGG=m
@@ -10956,7 +10952,6 @@ CONFIG_DEBUG_INFO_DWARF5=y
 # CONFIG_DEBUG_INFO_SPLIT is not set
 CONFIG_DEBUG_INFO_BTF=y
 CONFIG_PAHOLE_HAS_SPLIT_BTF=y
-CONFIG_PAHOLE_HAS_BTF_TAG=y
 CONFIG_DEBUG_INFO_BTF_MODULES=y
 # CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set
 # CONFIG_GDB_SCRIPTS is not set
@@ -11033,7 +11028,6 @@ CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
-CONFIG_CC_HAS_KASAN_SW_TAGS=y
 CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
 # CONFIG_KASAN is not set
 CONFIG_HAVE_ARCH_KFENCE=y