From d63326cd80dc8929e615d791d951099e166d4ad4 Mon Sep 17 00:00:00 2001 From: Piotr Gorski Date: Thu, 17 Nov 2022 22:32:40 +0100 Subject: [PATCH] Sync with Github Signed-off-by: Piotr Gorski --- .SRCINFO | 4 ++-- PKGBUILD | 35 +++-------------------------------- config-rt | 35 +++++++++++++++++++++-------------- 3 files changed, 26 insertions(+), 48 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 66af8cc..53d0d5f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -30,11 +30,11 @@ pkgbase = linux-cachyos source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.0/sched/0001-bore-cachy.patch sha256sums = 6114a208e82739b4a1ab059ace35262be2a83be34cd1ae23cb8a09337db831c7 sha256sums = cf045c82aceef20747a25fe27e464b4728e5dbc24f9abfbf0ae541b810c06744 - sha256sums = 34e2cad286f32d8c1c26e4ff18726c9e0aee151e82088bb78c3ae4fb536bf962 + sha256sums = c3aae004fe02ddf781037bf95ca9994692d19eda2b6b99d5cd767ae23edfb2a5 sha256sums = e1d45b5842079a5f0f53d7ea2d66ffa3f1497766f3ccffcf13ed00f1ac67f95e sha256sums = a0734e8dc037d4faae845f7f1c837ba1dbf304c786c1fcd4ff317a2959d64006 sha256sums = 8a29fd18c2deb36cf0bbfb16a84819d86fa476ef4792d07dd627c945c0b55f4b - sha256sums = d3ca68215afdd3464b133596729e4f88ba92e88940d267c26af9d6646cc477cc + sha256sums = d2a06dbee6da57a24d53fd73ba994195c00ce0ce8b5ae8d827e22632883d3c0b pkgname = linux-cachyos pkgdesc = The Linux BORE scheduler Kernel by CachyOS with other patches and improvements kernel and modules diff --git a/PKGBUILD b/PKGBUILD index 8eeb920..3abf722 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -97,13 +97,6 @@ _kyber_disable=${_kyber_disable-y} # 'none' - disable multigenerational LRU _lru_config=${_lru_config-'standard'} -### Enable per-VMA locking -# ATTENTION - one of three predefined values should be selected! -# 'standard' - enable per-VMA locking -# 'stats' - enable per-VMA locking with stats -# 'none' - disable per-VMA locking -_vma_config=${_vma_config-'standard'} - ## Enable DAMON _damon=${_damon-} @@ -654,28 +647,6 @@ prepare() { exit fi - ### Select VMA config - if [ "$_vma_config" = "standard" ]; then - echo "Enabling per-VMA locking..." - scripts/config --enable PER_VMA_LOCK \ - --disable PER_VMA_LOCK_STATS - elif [ "$_vma_config" = "stats" ]; then - echo "Enabling per-VMA locking with stats..." - scripts/config --enable PER_VMA_LOCK \ - --enable PER_VMA_LOCK_STATS - elif [ "$_vma_config" = "none" ]; then - echo "Disabling per-VMA locking..." - scripts/config --disable PER_VMA_LOCK - else - if [ -n "$_vma_config" ]; then - error "The value $_vma_config is invalid. Choose the correct one again." - else - error "The value is empty. Choose the correct one again." - fi - error "Enabling per-VMA locking failed!" - exit - fi - ### Enable DAMON if [ -n "$_damon" ]; then echo "Enabling DAMON..." @@ -994,7 +965,7 @@ _package-headers() { echo "Stripping build tools..." local file while read -rd '' file; do - case "$(file -bi "$file")" in + case "$(file -Sib "$file")" in application/x-sharedlib\;*) # Libraries (.so) strip -v $STRIP_SHARED "$file" ;; application/x-archive\;*) # Libraries (.a) @@ -1038,8 +1009,8 @@ done sha256sums=('6114a208e82739b4a1ab059ace35262be2a83be34cd1ae23cb8a09337db831c7' 'cf045c82aceef20747a25fe27e464b4728e5dbc24f9abfbf0ae541b810c06744' - '34e2cad286f32d8c1c26e4ff18726c9e0aee151e82088bb78c3ae4fb536bf962' + 'c3aae004fe02ddf781037bf95ca9994692d19eda2b6b99d5cd767ae23edfb2a5' 'e1d45b5842079a5f0f53d7ea2d66ffa3f1497766f3ccffcf13ed00f1ac67f95e' 'a0734e8dc037d4faae845f7f1c837ba1dbf304c786c1fcd4ff317a2959d64006' '8a29fd18c2deb36cf0bbfb16a84819d86fa476ef4792d07dd627c945c0b55f4b' - 'd3ca68215afdd3464b133596729e4f88ba92e88940d267c26af9d6646cc477cc') + 'd2a06dbee6da57a24d53fd73ba994195c00ce0ce8b5ae8d827e22632883d3c0b') diff --git a/config-rt b/config-rt index adef0d9..86592c8 100644 --- a/config-rt +++ b/config-rt @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.0.5 Kernel Configuration +# Linux/x86 6.0.9 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -550,6 +550,9 @@ CONFIG_EFI_MIXED=y # CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set # CONFIG_HZ_300 is not set +# CONFIG_HZ_500 is not set +# CONFIG_HZ_600 is not set +# CONFIG_HZ_750 is not set CONFIG_HZ_1000=y CONFIG_HZ=1000 CONFIG_SCHED_HRTICK=y @@ -726,6 +729,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y CONFIG_X86_INTEL_PSTATE=y CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_AMD_PSTATE=y +CONFIG_X86_AMD_PSTATE_UT=m CONFIG_X86_ACPI_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ_CPB=y CONFIG_X86_POWERNOW_K8=m @@ -1105,12 +1109,14 @@ CONFIG_ZSWAP=y CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD=y CONFIG_ZSWAP_COMPRESSOR_DEFAULT="zstd" # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD is not set -CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD=y +# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set -CONFIG_ZSWAP_ZPOOL_DEFAULT="z3fold" +CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBLOCK=y +CONFIG_ZSWAP_ZPOOL_DEFAULT="zblock" CONFIG_ZBUD=y CONFIG_Z3FOLD=y CONFIG_ZSMALLOC=y +CONFIG_ZBLOCK=y # CONFIG_ZSMALLOC_STAT is not set # @@ -10599,7 +10605,7 @@ CONFIG_LSM="landlock,lockdown,yama,integrity,bpf" # Memory initialization # CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y -CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_ENABLER=y CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y # CONFIG_INIT_STACK_NONE is not set # CONFIG_INIT_STACK_ALL_PATTERN is not set @@ -10612,8 +10618,6 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y # end of Memory initialization CONFIG_RANDSTRUCT_NONE=y -# CONFIG_RANDSTRUCT_FULL is not set -# CONFIG_RANDSTRUCT_PERFORMANCE is not set # end of Kernel hardening options # end of Security options @@ -10676,8 +10680,8 @@ CONFIG_CRYPTO_CURVE25519_X86=m # Authenticated Encryption with Associated Data # CONFIG_CRYPTO_CCM=m -CONFIG_CRYPTO_GCM=m -CONFIG_CRYPTO_CHACHA20POLY1305=m +CONFIG_CRYPTO_GCM=y +CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_AEGIS128=m CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m CONFIG_CRYPTO_SEQIV=m @@ -10724,9 +10728,9 @@ CONFIG_CRYPTO_BLAKE2S_X86=y CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m CONFIG_CRYPTO_CRC64_ROCKSOFT=y -CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_GHASH=y # CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set -CONFIG_CRYPTO_POLY1305=m +CONFIG_CRYPTO_POLY1305=y CONFIG_CRYPTO_POLY1305_X86_64=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y @@ -10767,7 +10771,7 @@ CONFIG_CRYPTO_CAST6_AVX_X86_64=m CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_DES3_EDE_X86_64=m CONFIG_CRYPTO_FCRYPT=m -CONFIG_CRYPTO_CHACHA20=m +CONFIG_CRYPTO_CHACHA20=y CONFIG_CRYPTO_CHACHA20_X86_64=m # CONFIG_CRYPTO_ARIA is not set CONFIG_CRYPTO_SERPENT=m @@ -10898,7 +10902,7 @@ CONFIG_CRYPTO_LIB_ARC4=m CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m -CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m +CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y CONFIG_CRYPTO_LIB_CHACHA=m CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m @@ -10906,7 +10910,7 @@ CONFIG_CRYPTO_LIB_CURVE25519=m CONFIG_CRYPTO_LIB_DES=m CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11 CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m -CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m +CONFIG_CRYPTO_LIB_POLY1305_GENERIC=y CONFIG_CRYPTO_LIB_POLY1305=m CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m CONFIG_CRYPTO_LIB_SHA1=y @@ -11081,10 +11085,12 @@ CONFIG_AS_HAS_NON_CONST_LEB128=y # CONFIG_DEBUG_INFO_DWARF4 is not set CONFIG_DEBUG_INFO_DWARF5=y # CONFIG_DEBUG_INFO_REDUCED is not set -# CONFIG_DEBUG_INFO_COMPRESSED is not set +CONFIG_DEBUG_INFO_COMPRESSED_NONE=y +# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set # 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 @@ -11402,6 +11408,7 @@ CONFIG_ASYNC_RAID6_TEST=m # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_UUID is not set # CONFIG_TEST_XARRAY is not set +# CONFIG_TEST_MAPLE_TREE is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SIPHASH is not set # CONFIG_TEST_IDA is not set