summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. Jung2021-10-30 23:44:59 +0200
committerP. Jung2021-10-30 23:44:59 +0200
commit5d196c0e06e184cff70115c24f53fb9c94141452 (patch)
tree52facc329abb0fa9cbfa9180cfd1cf66066a6c0f
parent7fb84a802b224f160513fc255e125eb5a300dd49 (diff)
downloadaur-5d196c0e06e184cff70115c24f53fb9c94141452.tar.gz
fix
-rw-r--r--.SRCINFO42
-rw-r--r--PKGBUILD58
-rw-r--r--config104
3 files changed, 81 insertions, 123 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0c4f4339d356..827729ac1ab4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
-pkgbase = linux-cachyos-cacule-rc
+pkgbase = linux-cacule
pkgdesc = Linux-CacULE Kernel-RC by Hamad Marri and with some other patchsets
- pkgver = 5.15.rc6
- pkgrel = 1
+ pkgver = 5.15.rc7
+ pkgrel = 2
url = https://github.com/cachyos/linux-cachyos
arch = x86_64
arch = x86_64_v3
@@ -18,10 +18,15 @@ pkgbase = linux-cachyos-cacule-rc
makedepends = perl
makedepends = tar
makedepends = xz
+ makedepends = clang
+ makedepends = llvm
+ makedepends = lld
+ makedepends = python
options = !strip
- source = https://git.kernel.org/torvalds/t/linux-5.15-rc6.tar.gz
+ source = https://git.kernel.org/torvalds/t/linux-5.15-rc7.tar.gz
source = config
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/CacULE/v5.15/cacule-5.15-full.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-add-600hz-cfs-fixes.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-amdpstate.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-bbr2.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-zstd.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-mm.patch
@@ -32,31 +37,26 @@ pkgbase = linux-cachyos-cacule-rc
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-hwmon.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-sitemap.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-bitops.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-disable-SCHEDUTIL.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-hz-dynamicpreept.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/misc/0002-init-Kconfig-enable-O3-for-all-arches.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-pstate.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-var.patch
source = auto-cpu-optimization.sh
- md5sums = 3577e4e5970c537de05e0a96ade385b5
- md5sums = f3f883a7af43bd61c84c9a892c32573e
- md5sums = afdbe964cd00357ef7248553ab9db091
+ md5sums = 9d41c6fb84bd69b5e477c7cd302b0e4f
+ md5sums = 18aaf622d2e8292feec718c754a58ab3
+ md5sums = 146bf117e5aef77478aca8e2422d2554
+ md5sums = a5cedf5e8027082246f9a485baf859c1
md5sums = 2a8097ba46be56fbbe3967e9c34c9a0b
md5sums = e6c5e75b6e71f7a3d81f5dbad64188a8
md5sums = e422617aff583cec11129e0f185e9549
md5sums = 7d5cf45bcce33f1ed82f660efb089d3c
md5sums = acbaad682b7660e691d756680a8a3274
- md5sums = b2a3fe5958abed934b14c345ab32a698
- md5sums = ff4b20b981d9ae0bdda68f012b03e756
+ md5sums = 7fa046fd98013a89ed5f57b18c612068
+ md5sums = ba2b51078c24de01aa604d24673326d6
md5sums = 9788f0fb9ae2b72bd8bdab660c8cbddc
md5sums = 41f2c3ccfdef3ed7ceb43a345841933c
md5sums = 02ce3ecc02498f26a18a02717f808432
- md5sums = 95243b2c7d4d3e56a38fabc85786afcc
- md5sums = f88c3290ece724c81921059df14965cf
- md5sums = ceb9020f754c9a0c3f526b38abc714dd
- md5sums = 373a1df8cddeb7807b6adf7b2ab03bc2
+ md5sums = bf01cd68a9f188bd9baa891f1c07ad30
md5sums = 21c98f19e883879dd3336c1fa143fd31
-pkgname = linux-cachyos-cacule-rc
+pkgname = linux-cacule
pkgdesc = The Linux-CacULE Kernel-RC by Hamad Marri and with some other patchsets kernel and modules
depends = coreutils
depends = kmod
@@ -65,7 +65,7 @@ pkgname = linux-cachyos-cacule-rc
optdepends = linux-firmware: firmware images needed for some devices
optdepends = modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig
-pkgname = linux-cachyos-cacule-rc-headers
+pkgname = linux-cacule-headers
pkgdesc = Headers and scripts for building modules for the Linux-CacULE Kernel-RC by Hamad Marri and with some other patchsets kernel
- depends = linux-cachyos-cacule-rc=5.15.rc6
+ depends = linux-cacule=5.15.rc7
depends = pahole
diff --git a/PKGBUILD b/PKGBUILD
index 8bdc6f3c8a2e..3b7532144f56 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,8 @@
# Set the next two variables to ANYTHING that is not null to enable them
# Selecting CacULE or CacULE-RDB scheduler, default:cacule
-_cpusched='cacule'
#_cpusched='rdb'
-
+#_cpusched='tt'
# NUMA is optimized for multi-socket motherboards.
# A single multi-core CPU actually runs slower with NUMA enabled.
@@ -48,7 +47,7 @@ _lrng_enable=y
_ksmbd_enable=
# Tweak kernel options prior to a build via nconfig
-_makenconfig=
+_makenconfig=y
## Apply Kernel automatic Optimization
@@ -85,10 +84,10 @@ _zstd_module_level='normal'
_fork_brute=
## Enable it for compiling with LLVM and THINLTO
-_use_llvm_lto=
+_use_llvm_lto=y
# Enable it for using the LLVM CFI PATCH for a better security
-_use_cfi=
+_use_cfi=y
## Enable PGO (patch is failing when cfi is also used)
_use_pgo=
@@ -111,27 +110,19 @@ _localmodcfg=
_use_current=
# Tweak kernel options prior to a build via nconfig
-_makenconfig=
+_makenconfig=y
-if [ "$_cpusched" = "cacule" ] && [ -n "$_use_llvm_lto" ]; then
- pkgbase=linux-cachyos-cacule-rc-lto
-elif [ "$_cpusched" = "rdb" ] && [ -n "$_use_llvm_lto" ]; then
- pkgbase=linux-cachyos-rc-rdb-lto
-elif [ "$_cpusched" = "cacule" ]; then
- pkgbase=linux-cachyos-cacule-rc
-elif [ "$_cpusched" = "rdb" ]; then
- pkgbase=linux-cacule-rdb-rc
-fi
+pkgbase=linux-cacule
_major=5.15
#_minor=1
#_minorc=$((_minor+1))
-_rcver=rc6
+_rcver=rc7
pkgver=${_major}.${_rcver}
#_stable=${_major}.${_minor}
_stablerc=${_major}-${_rcver}
_srcname=linux-${_stablerc}
-pkgrel=1
+pkgrel=2
pkgdesc='Linux-CacULE Kernel-RC by Hamad Marri and with some other patchsets'
arch=('x86_64' 'x86_64_v3')
url="https://github.com/cachyos/linux-cachyos"
@@ -146,7 +137,8 @@ _caculepatches="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/
_patchsource="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15"
source=("https://git.kernel.org/torvalds/t/linux-${_stablerc}.tar.gz"
"config"
- "${_caculepatches}/v5.15/cacule-5.15-full.patch"
+ "${_patchsource}/0001-add-600hz-cfs-fixes.patch"
+ "${_patchsource}/0001-amdpstate.patch"
"${_patchsource}/0001-bbr2.patch"
"${_patchsource}/0001-zstd.patch"
"${_patchsource}/0001-mm.patch"
@@ -157,11 +149,7 @@ source=("https://git.kernel.org/torvalds/t/linux-${_stablerc}.tar.gz"
"${_patchsource}/0001-hwmon.patch"
"${_patchsource}/0001-sitemap.patch"
"${_patchsource}/0001-bitops.patch"
- "${_patchsource}/0001-disable-SCHEDUTIL.patch"
- # "${_patchsource}/0001-clearlinux.patch"
- "${_patchsource}/0001-hz-dynamicpreept.patch"
- "${_patchsource}/misc/0002-init-Kconfig-enable-O3-for-all-arches.patch"
- "${_patchsource}/0001-pstate.patch"
+ "${_patchsource}/0001-var.patch"
"auto-cpu-optimization.sh"
)
if [ -n "$_use_llvm_lto" ]; then
@@ -420,14 +408,6 @@ prepare() {
echo "Enabling FULLCONENAT..."
scripts/config --module CONFIG_IP_NF_TARGET_FULLCONENAT
scripts/config --module CONFIG_NETFILTER_XT_TARGET_FULLCONENAT
- echo "Setting performance governor..."
- scripts/config --disable CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL
- scripts/config --enable CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND
- scripts/config --enable CONFIG_CPU_FREQ_GOV_PERFORMANCE
- scripts/config --enable CONFIG_CPU_FREQ_GOV_ONDEMAND
- scripts/config --enable CONFIG_CPU_FREQ_GOV_CONSERVATIVE
- scripts/config --enable CONFIG_CPU_FREQ_GOV_USERSPACE
- scripts/config --enable CONFIG_CPU_FREQ_GOV_SCHEDUTIL
echo "Enable AMD PSTATE v2 driver"
scripts/config --enable CONFIG_X86_AMD_PSTATE
@@ -591,21 +571,19 @@ for _p in "${pkgname[@]}"; do
done
-md5sums=('3577e4e5970c537de05e0a96ade385b5'
- 'f3f883a7af43bd61c84c9a892c32573e'
- 'afdbe964cd00357ef7248553ab9db091'
+md5sums=('9d41c6fb84bd69b5e477c7cd302b0e4f'
+ '18aaf622d2e8292feec718c754a58ab3'
+ '146bf117e5aef77478aca8e2422d2554'
+ 'a5cedf5e8027082246f9a485baf859c1'
'2a8097ba46be56fbbe3967e9c34c9a0b'
'e6c5e75b6e71f7a3d81f5dbad64188a8'
'e422617aff583cec11129e0f185e9549'
'7d5cf45bcce33f1ed82f660efb089d3c'
'acbaad682b7660e691d756680a8a3274'
- 'b2a3fe5958abed934b14c345ab32a698'
- 'ff4b20b981d9ae0bdda68f012b03e756'
+ '7fa046fd98013a89ed5f57b18c612068'
+ 'ba2b51078c24de01aa604d24673326d6'
'9788f0fb9ae2b72bd8bdab660c8cbddc'
'41f2c3ccfdef3ed7ceb43a345841933c'
'02ce3ecc02498f26a18a02717f808432'
- '95243b2c7d4d3e56a38fabc85786afcc'
- 'f88c3290ece724c81921059df14965cf'
- 'ceb9020f754c9a0c3f526b38abc714dd'
- '373a1df8cddeb7807b6adf7b2ab03bc2'
+ 'bf01cd68a9f188bd9baa891f1c07ad30'
'21c98f19e883879dd3336c1fa143fd31')
diff --git a/config b/config
index c95b58b94c0e..a84635ef0c19 100644
--- a/config
+++ b/config
@@ -1,27 +1,27 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.0 rc6 Kernel Configuration
-#
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0"
-CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=110100
-CONFIG_CLANG_VERSION=0
-CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=23601
-CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=23601
-CONFIG_LLD_VERSION=0
+# Linux/x86 5.15.0 Kernel Configuration
+#
+CONFIG_CC_VERSION_TEXT="clang version 14.0.0 (/tmp/pkg/llvm-project 94213bc7decb1d4c131fb6feb5101e859640478f)"
+CONFIG_GCC_VERSION=0
+CONFIG_CC_IS_CLANG=y
+CONFIG_CLANG_VERSION=140000
+CONFIG_AS_IS_LLVM=y
+CONFIG_AS_VERSION=140000
+CONFIG_LD_VERSION=0
+CONFIG_LD_IS_LLD=y
+CONFIG_LLD_VERSION=140000
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_TOOLS_SUPPORT_RELR=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
-
#
# General setup
#
@@ -124,13 +124,9 @@ CONFIG_BPF_PRELOAD_UMD=m
CONFIG_BPF_LSM=y
# end of BPF subsystem
-# CONFIG_PREEMPT_NONE_BEHAVIOUR is not set
-# CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR is not set
-CONFIG_PREEMPT_BEHAVIOUR=y
-CONFIG_PREEMPT=y
-CONFIG_PREEMPT_COUNT=y
-CONFIG_PREEMPTION=y
-CONFIG_PREEMPT_DYNAMIC=y
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
CONFIG_SCHED_CORE=y
#
@@ -156,12 +152,10 @@ CONFIG_CPU_ISOLATION=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
-CONFIG_PREEMPT_RCU=y
CONFIG_RCU_EXPERT=y
CONFIG_SRCU=y
CONFIG_TREE_SRCU=y
CONFIG_TASKS_RCU_GENERIC=y
-CONFIG_TASKS_RCU=y
CONFIG_TASKS_RUDE_RCU=y
CONFIG_TASKS_TRACE_RCU=y
CONFIG_RCU_STALL_COMMON=y
@@ -169,8 +163,6 @@ CONFIG_RCU_NEED_SEGCBLIST=y
CONFIG_RCU_FANOUT=64
CONFIG_RCU_FANOUT_LEAF=16
CONFIG_RCU_FAST_NO_HZ=y
-CONFIG_RCU_BOOST=y
-CONFIG_RCU_BOOST_DELAY=500
# CONFIG_RCU_NOCB_CPU is not set
# CONFIG_TASKS_TRACE_RCU_READ_MB is not set
# end of RCU Subsystem
@@ -192,9 +184,6 @@ CONFIG_UCLAMP_TASK=y
CONFIG_UCLAMP_BUCKETS_COUNT=5
# end of Scheduler features
-CONFIG_CACULE_SCHED=y
-CONFIG_CACULE_RDB=y
-CONFIG_RDB_INTERVAL=19
CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
CONFIG_CC_HAS_INT128=y
@@ -401,7 +390,7 @@ CONFIG_ACRN_GUEST=y
# CONFIG_MEXCAVATOR is not set
# CONFIG_MZEN is not set
# CONFIG_MZEN2 is not set
-# CONFIG_MZEN3 is not set
+# CONFIG_MZEN is not set
# CONFIG_MPSC is not set
# CONFIG_MCORE2 is not set
# CONFIG_MATOM is not set
@@ -424,7 +413,7 @@ CONFIG_ACRN_GUEST=y
# CONFIG_MSAPPHIRERAPIDS is not set
# CONFIG_MROCKETLAKE is not set
# CONFIG_MALDERLAKE is not set
-# CONFIG_GENERIC_CPU is not set
+CONFIG_GENERIC_CPU=y
# CONFIG_GENERIC_CPU2 is not set
# CONFIG_GENERIC_CPU3 is not set
# CONFIG_GENERIC_CPU4 is not set
@@ -474,7 +463,7 @@ CONFIG_PERF_EVENTS_INTEL_UNCORE=m
CONFIG_PERF_EVENTS_INTEL_RAPL=m
CONFIG_PERF_EVENTS_INTEL_CSTATE=m
CONFIG_PERF_EVENTS_AMD_POWER=m
-CONFIG_PERF_EVENTS_AMD_UNCORE=m
+CONFIG_PERF_EVENTS_AMD_UNCORE=y
# end of Performance monitoring
CONFIG_X86_16BIT=y
@@ -523,12 +512,9 @@ CONFIG_EFI_STUB=y
CONFIG_EFI_MIXED=y
# CONFIG_HZ_100 is not set
# CONFIG_HZ_250 is not set
-CONFIG_HZ_300=y
-# CONFIG_HZ_600 is not set
-# CONFIG_HZ_750 is not set
-# CONFIG_HZ_1000 is not set
-# CONFIG_HZ_2000 is not set
-CONFIG_HZ=300
+# CONFIG_HZ_300 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
CONFIG_SCHED_HRTICK=y
CONFIG_KEXEC=y
CONFIG_KEXEC_FILE=y
@@ -665,8 +651,7 @@ CONFIG_CPU_FREQ_STAT=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
CONFIG_CPU_FREQ_GOV_USERSPACE=y
@@ -823,14 +808,12 @@ CONFIG_HAVE_ARCH_STACKLEAK=y
CONFIG_HAVE_STACKPROTECTOR=y
CONFIG_STACKPROTECTOR=y
CONFIG_STACKPROTECTOR_STRONG=y
-CONFIG_LTO=y
-CONFIG_LTO_CLANG=y
CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
CONFIG_HAS_LTO_CLANG=y
-CONFIG_LTO_NONE=y
-CONFIG_LTO_CLANG_THIN=y
-# CONFIG_LTO_CLANG_FULL is not set
+# CONFIG_LTO_NONE is not set
+# CONFIG_LTO_CLANG_FULL=y
+# CONFIG_LTO_CLANG_THIN is not set
CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
CONFIG_HAVE_CONTEXT_TRACKING=y
CONFIG_HAVE_CONTEXT_TRACKING_OFFSTACK=y
@@ -983,7 +966,11 @@ CONFIG_BFQ_GROUP_IOSCHED=y
CONFIG_PREEMPT_NOTIFIERS=y
CONFIG_PADATA=y
CONFIG_ASN1=y
-CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
@@ -2011,7 +1998,7 @@ CONFIG_AF_RXRPC_DEBUG=y
CONFIG_RXKAD=y
CONFIG_AF_KCM=m
CONFIG_STREAM_PARSER=y
-CONFIG_MCTP=m
+# CONFIG_MCTP is not set
CONFIG_FIB_RULES=y
CONFIG_WIRELESS=y
CONFIG_WIRELESS_EXT=y
@@ -3483,10 +3470,6 @@ CONFIG_DP83869_PHY=m
CONFIG_VITESSE_PHY=m
CONFIG_XILINX_GMII2RGMII=m
CONFIG_MICREL_KS8995MA=m
-
-#
-# MCTP Device Drivers
-#
CONFIG_MDIO_DEVICE=m
CONFIG_MDIO_BUS=m
CONFIG_FWNODE_MDIO=m
@@ -5238,7 +5221,7 @@ CONFIG_WATCHDOG_CORE=y
CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
CONFIG_WATCHDOG_OPEN_TIMEOUT=0
CONFIG_WATCHDOG_SYSFS=y
-CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT=y
+# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set
#
# Watchdog Pretimeout Governors
@@ -5609,13 +5592,10 @@ CONFIG_RC_XBOX_DVD=m
CONFIG_IR_TOY=m
CONFIG_CEC_CORE=m
CONFIG_CEC_NOTIFIER=y
-CONFIG_CEC_PIN=y
CONFIG_MEDIA_CEC_RC=y
-# CONFIG_CEC_PIN_ERROR_INJ is not set
CONFIG_MEDIA_CEC_SUPPORT=y
CONFIG_CEC_CH7322=m
CONFIG_CEC_CROS_EC=m
-CONFIG_CEC_GPIO=m
CONFIG_CEC_SECO=m
CONFIG_CEC_SECO_RC=y
CONFIG_USB_PULSE8_CEC=m
@@ -6836,7 +6816,7 @@ CONFIG_SND_SOC_AMD_ACP3x=m
CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m
CONFIG_SND_SOC_AMD_RENOIR=m
CONFIG_SND_SOC_AMD_RENOIR_MACH=m
-CONFIG_SND_SOC_AMD_ACP5x=m
+# CONFIG_SND_SOC_AMD_ACP5x is not set
CONFIG_SND_ATMEL_SOC=m
# CONFIG_SND_BCM63XX_I2S_WHISTLER is not set
CONFIG_SND_DESIGNWARE_I2S=m
@@ -8180,7 +8160,7 @@ CONFIG_INTEL_IDXD_SVM=y
CONFIG_INTEL_IDXD_PERFMON=y
CONFIG_INTEL_IOATDMA=m
CONFIG_PLX_DMA=m
-CONFIG_AMD_PTDMA=m
+# CONFIG_AMD_PTDMA is not set
CONFIG_QCOM_HIDMA_MGMT=m
CONFIG_QCOM_HIDMA=m
CONFIG_DW_DMAC_CORE=y
@@ -8203,7 +8183,7 @@ CONFIG_DMA_ENGINE_RAID=y
# DMABUF options
#
CONFIG_SYNC_FILE=y
-# CONFIG_SW_SYNC is not set
+CONFIG_SW_SYNC=y
CONFIG_UDMABUF=y
# CONFIG_DMABUF_MOVE_NOTIFY is not set
# CONFIG_DMABUF_DEBUG is not set
@@ -8441,6 +8421,7 @@ CONFIG_DVB_SP8870=m
#
# Android
#
+CONFIG_ASHMEM=y
# end of Android
CONFIG_LTE_GDM724X=m
@@ -9440,7 +9421,11 @@ CONFIG_USB4=m
#
# Android
#
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
# end of Android
CONFIG_LIBNVDIMM=y
@@ -9673,10 +9658,7 @@ CONFIG_FAT_DEFAULT_UTF8=y
CONFIG_EXFAT_FS=m
CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
# CONFIG_NTFS_FS is not set
-CONFIG_NTFS3_FS=m
-# CONFIG_NTFS3_64BIT_CLUSTER is not set
-# CONFIG_NTFS3_LZX_XPRESS is not set
-# CONFIG_NTFS3_FS_POSIX_ACL is not set
+# CONFIG_NTFS3_FS is not set
# end of DOS/FAT/EXFAT/NT Filesystems
#
@@ -10571,7 +10553,6 @@ CONFIG_SCHEDSTATS=y
# end of Scheduler Debugging
# CONFIG_DEBUG_TIMEKEEPING is not set
-# CONFIG_DEBUG_PREEMPT is not set
#
# Lock Debugging (spinlocks, mutexes, etc...)
@@ -10656,7 +10637,6 @@ CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y
CONFIG_FUNCTION_PROFILER=y
CONFIG_STACK_TRACER=y
# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
CONFIG_SCHED_TRACER=y
CONFIG_HWLAT_TRACER=y
CONFIG_OSNOISE_TRACER=y