From 56548a658b3c8924b4e85be0b5b59282198582fc Mon Sep 17 00:00:00 2001
From: Yttehs <Yttehs-HDX@github.com>
Date: Sun, 11 Feb 2024 12:01:29 +0800
Subject: [PATCH] Fetch upstream InfiniR-X.

---
 arch/arm64/configs/ucmi_nethunter_defconfig | 29 ++++++++-------------
 build.sh                                    |  7 +++--
 ucmi_nethunter_defconfig                    | 29 ++++++++-------------
 3 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/arch/arm64/configs/ucmi_nethunter_defconfig b/arch/arm64/configs/ucmi_nethunter_defconfig
index 25607e1da9a6..f341e31b8ce7 100644
--- a/arch/arm64/configs/ucmi_nethunter_defconfig
+++ b/arch/arm64/configs/ucmi_nethunter_defconfig
@@ -1,4 +1,4 @@
-CONFIG_LOCALVERSION="-InfiniR-NetHunter"
+CONFIG_LOCALVERSION="-InfiniR-X-NetHunter"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_DEFAULT_HOSTNAME="archlinux"
 CONFIG_SYSVIPC=y
@@ -9,10 +9,8 @@ CONFIG_PREEMPT=y
 CONFIG_IRQ_TIME_ACCOUNTING=y
 CONFIG_SCHED_WALT=y
 CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_PSI=y
 CONFIG_RCU_EXPERT=y
 CONFIG_RCU_FAST_NO_HZ=y
 CONFIG_RCU_NOCB_CPU=y
@@ -30,13 +28,11 @@ CONFIG_SCHED_CORE_CTL=y
 CONFIG_MIHW=y
 CONFIG_PACKAGE_RUNTIME_INFO=y
 CONFIG_PERF_HUMANTASK=y
-CONFIG_KPERFEVENTS=y
 CONFIG_PERF_CRITICAL_RT_TASK=y
 CONFIG_NAMESPACES=y
 # CONFIG_PID_NS is not set
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCHED_TUNE=y
-CONFIG_DYNAMIC_STUNE_BOOST=y
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_RD_BZIP2 is not set
 # CONFIG_RD_LZMA is not set
@@ -112,16 +108,12 @@ CONFIG_PM_WAKELOCKS_LIMIT=0
 # CONFIG_PM_WAKELOCKS_GC is not set
 CONFIG_PM_DEBUG=y
 CONFIG_PM_ADVANCED_DEBUG=y
-CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
 CONFIG_ENERGY_MODEL=y
 CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_TEO=y
 CONFIG_ARM_CPUIDLE=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_TIMES=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_BOOST=y
 CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 CONFIG_CPU_INPUT_BOOST=y
@@ -150,6 +142,7 @@ CONFIG_BLK_INLINE_ENCRYPTION=y
 CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_IOSCHED_NOOP is not set
+# CONFIG_IOSCHED_DEADLINE is not set
 CONFIG_CFQ_GROUP_IOSCHED=y
 # CONFIG_MQ_IOSCHED_DEADLINE is not set
 # CONFIG_MQ_IOSCHED_KYBER is not set
@@ -160,7 +153,12 @@ CONFIG_CMA=y
 CONFIG_CMA_AREAS=16
 CONFIG_ZSMALLOC=y
 CONFIG_MM_EVENT_STAT=y
-CONFIG_OPLUS_MM_HACKS=y
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+CONFIG_DAMON=y
+CONFIG_DAMON_VADDR=y
+CONFIG_DAMON_PADDR=y
+CONFIG_DAMON_RECLAIM=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
@@ -360,6 +358,7 @@ CONFIG_MTD_BLOCK=y
 CONFIG_MTD_OOPS=y
 CONFIG_MTD_BLOCK2MTD=y
 CONFIG_ZRAM=y
+# CONFIG_ZRAM_WRITEBACK is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=16
 CONFIG_BLK_DEV_RAM=y
@@ -367,7 +366,6 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_HDCP_QSEECOM=y
 CONFIG_QSEECOM=y
 CONFIG_UID_SYS_STATS=y
-CONFIG_AUTO_KPROFILES_MI_DRM=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_SG=y
@@ -476,7 +474,6 @@ CONFIG_SPMI=y
 CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
 CONFIG_PINCTRL_KONA=y
 CONFIG_GPIO_SYSFS=y
-CONFIG_POWER_AVS=y
 CONFIG_POWER_RESET_QCOM=y
 CONFIG_POWER_RESET_XGENE=y
 CONFIG_POWER_RESET_SYSCON=y
@@ -744,7 +741,6 @@ CONFIG_USB_CONFIGFS_OBEX=y
 CONFIG_USB_CONFIGFS_NCM=y
 CONFIG_USB_CONFIGFS_ECM=y
 CONFIG_USB_CONFIGFS_ECM_SUBSET=y
-CONFIG_USB_CONFIGFS_QCRNDIS=y
 CONFIG_USB_CONFIGFS_RNDIS=y
 CONFIG_USB_CONFIGFS_EEM=y
 CONFIG_USB_CONFIGFS_MASS_STORAGE=y
@@ -782,7 +778,6 @@ CONFIG_ION=y
 CONFIG_ION_SYSTEM_HEAP=y
 CONFIG_QCA_CLD_WLAN=y
 CONFIG_QCA_CLD_WLAN_PROFILE="qca6390"
-CONFIG_MI_RECLAIM=y
 CONFIG_QPNP_REVID=y
 CONFIG_SPS=y
 CONFIG_SPS_SUPPORT_NDP_BAM=y
@@ -846,7 +841,6 @@ CONFIG_MSM_PIL_SSR_GENERIC=y
 CONFIG_MSM_BOOT_STATS=y
 CONFIG_QCOM_DCC_V2=y
 CONFIG_QCOM_EUD=y
-CONFIG_QCOM_MINIDUMP=y
 CONFIG_QCOM_FSA4480_I2C=y
 CONFIG_QCOM_WATCHDOG_V2=y
 CONFIG_QCOM_INITIAL_LOGBUF=y
@@ -889,8 +883,6 @@ CONFIG_DEVFREQ_INPUT_BOOST_DURATION_MS=58
 CONFIG_EXTCON_USB_GPIO=y
 CONFIG_IIO=y
 CONFIG_QCOM_SPMI_ADC5=y
-CONFIG_CH101_I2C=y
-CONFIG_ADS7052_TDK_THERMISTOR=y
 CONFIG_PWM=y
 CONFIG_PWM_QTI_LPG=y
 CONFIG_QCOM_PDC=y
@@ -901,6 +893,7 @@ CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ANDROID_BINDERFS=y
 CONFIG_BINDER_OPT=y
+CONFIG_ANDROID_SIMPLE_LMK=y
 # CONFIG_NVMEM_SYSFS is not set
 CONFIG_QCOM_QFPROM=y
 CONFIG_NVMEM_SPMI_SDAM=y
@@ -951,7 +944,6 @@ CONFIG_PSTORE_RAM=y
 CONFIG_EROFS_FS=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
-CONFIG_UNICODE=y
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_HARDENED_USERCOPY=y
@@ -973,5 +965,6 @@ CONFIG_PRINTK_TIME=y
 CONFIG_FRAME_WARN=4096
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_PANIC_TIMEOUT=-1
+CONFIG_SCHEDSTATS=y
 CONFIG_FTRACE=y
 CONFIG_DEBUG_ALIGN_RODATA=y
diff --git a/build.sh b/build.sh
index 4392bc34b14d..57c190ad82ea 100755
--- a/build.sh
+++ b/build.sh
@@ -6,7 +6,7 @@
 # This script is used to build android kernel for mi10 #
 # ===----------------------------------------------=== #
 
-KERNEL_VERSION="2.1"
+KERNEL_VERSION="2.2"
 
 # ===------------=== #
 # Clone Dependencies #
@@ -150,6 +150,9 @@ make ${args} 2>&1
 echo "[!] compiling modules"
 make ${args} INSTALL_MOD_PATH="." INSTALL_MOD_STRIP=1 modules_install
 
+echo "[!] clean dirs"
+rm -rf KernelSU
+
 # ===-----------------------------=== #
 # | Create NetHunter-Anykernel3 Zip | #
 # ===-----------------------------=== #
@@ -158,7 +161,7 @@ echo "[+] start packaging"
 
 O=out
 ARCH=arm64
-KERNEL_VERSION="4.19.306-InfiniR-NetHunter"
+KERNEL_VERSION="4.19.306-InfiniR-X-NetHunter"
 DEVICE=ucmi
 ANDROID_VERSION=thirteen
 
diff --git a/ucmi_nethunter_defconfig b/ucmi_nethunter_defconfig
index 25607e1da9a6..f341e31b8ce7 100644
--- a/ucmi_nethunter_defconfig
+++ b/ucmi_nethunter_defconfig
@@ -1,4 +1,4 @@
-CONFIG_LOCALVERSION="-InfiniR-NetHunter"
+CONFIG_LOCALVERSION="-InfiniR-X-NetHunter"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_DEFAULT_HOSTNAME="archlinux"
 CONFIG_SYSVIPC=y
@@ -9,10 +9,8 @@ CONFIG_PREEMPT=y
 CONFIG_IRQ_TIME_ACCOUNTING=y
 CONFIG_SCHED_WALT=y
 CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_PSI=y
 CONFIG_RCU_EXPERT=y
 CONFIG_RCU_FAST_NO_HZ=y
 CONFIG_RCU_NOCB_CPU=y
@@ -30,13 +28,11 @@ CONFIG_SCHED_CORE_CTL=y
 CONFIG_MIHW=y
 CONFIG_PACKAGE_RUNTIME_INFO=y
 CONFIG_PERF_HUMANTASK=y
-CONFIG_KPERFEVENTS=y
 CONFIG_PERF_CRITICAL_RT_TASK=y
 CONFIG_NAMESPACES=y
 # CONFIG_PID_NS is not set
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCHED_TUNE=y
-CONFIG_DYNAMIC_STUNE_BOOST=y
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_RD_BZIP2 is not set
 # CONFIG_RD_LZMA is not set
@@ -112,16 +108,12 @@ CONFIG_PM_WAKELOCKS_LIMIT=0
 # CONFIG_PM_WAKELOCKS_GC is not set
 CONFIG_PM_DEBUG=y
 CONFIG_PM_ADVANCED_DEBUG=y
-CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
 CONFIG_ENERGY_MODEL=y
 CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_TEO=y
 CONFIG_ARM_CPUIDLE=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_TIMES=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_BOOST=y
 CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 CONFIG_CPU_INPUT_BOOST=y
@@ -150,6 +142,7 @@ CONFIG_BLK_INLINE_ENCRYPTION=y
 CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_IOSCHED_NOOP is not set
+# CONFIG_IOSCHED_DEADLINE is not set
 CONFIG_CFQ_GROUP_IOSCHED=y
 # CONFIG_MQ_IOSCHED_DEADLINE is not set
 # CONFIG_MQ_IOSCHED_KYBER is not set
@@ -160,7 +153,12 @@ CONFIG_CMA=y
 CONFIG_CMA_AREAS=16
 CONFIG_ZSMALLOC=y
 CONFIG_MM_EVENT_STAT=y
-CONFIG_OPLUS_MM_HACKS=y
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+CONFIG_DAMON=y
+CONFIG_DAMON_VADDR=y
+CONFIG_DAMON_PADDR=y
+CONFIG_DAMON_RECLAIM=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
@@ -360,6 +358,7 @@ CONFIG_MTD_BLOCK=y
 CONFIG_MTD_OOPS=y
 CONFIG_MTD_BLOCK2MTD=y
 CONFIG_ZRAM=y
+# CONFIG_ZRAM_WRITEBACK is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=16
 CONFIG_BLK_DEV_RAM=y
@@ -367,7 +366,6 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_HDCP_QSEECOM=y
 CONFIG_QSEECOM=y
 CONFIG_UID_SYS_STATS=y
-CONFIG_AUTO_KPROFILES_MI_DRM=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_SG=y
@@ -476,7 +474,6 @@ CONFIG_SPMI=y
 CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
 CONFIG_PINCTRL_KONA=y
 CONFIG_GPIO_SYSFS=y
-CONFIG_POWER_AVS=y
 CONFIG_POWER_RESET_QCOM=y
 CONFIG_POWER_RESET_XGENE=y
 CONFIG_POWER_RESET_SYSCON=y
@@ -744,7 +741,6 @@ CONFIG_USB_CONFIGFS_OBEX=y
 CONFIG_USB_CONFIGFS_NCM=y
 CONFIG_USB_CONFIGFS_ECM=y
 CONFIG_USB_CONFIGFS_ECM_SUBSET=y
-CONFIG_USB_CONFIGFS_QCRNDIS=y
 CONFIG_USB_CONFIGFS_RNDIS=y
 CONFIG_USB_CONFIGFS_EEM=y
 CONFIG_USB_CONFIGFS_MASS_STORAGE=y
@@ -782,7 +778,6 @@ CONFIG_ION=y
 CONFIG_ION_SYSTEM_HEAP=y
 CONFIG_QCA_CLD_WLAN=y
 CONFIG_QCA_CLD_WLAN_PROFILE="qca6390"
-CONFIG_MI_RECLAIM=y
 CONFIG_QPNP_REVID=y
 CONFIG_SPS=y
 CONFIG_SPS_SUPPORT_NDP_BAM=y
@@ -846,7 +841,6 @@ CONFIG_MSM_PIL_SSR_GENERIC=y
 CONFIG_MSM_BOOT_STATS=y
 CONFIG_QCOM_DCC_V2=y
 CONFIG_QCOM_EUD=y
-CONFIG_QCOM_MINIDUMP=y
 CONFIG_QCOM_FSA4480_I2C=y
 CONFIG_QCOM_WATCHDOG_V2=y
 CONFIG_QCOM_INITIAL_LOGBUF=y
@@ -889,8 +883,6 @@ CONFIG_DEVFREQ_INPUT_BOOST_DURATION_MS=58
 CONFIG_EXTCON_USB_GPIO=y
 CONFIG_IIO=y
 CONFIG_QCOM_SPMI_ADC5=y
-CONFIG_CH101_I2C=y
-CONFIG_ADS7052_TDK_THERMISTOR=y
 CONFIG_PWM=y
 CONFIG_PWM_QTI_LPG=y
 CONFIG_QCOM_PDC=y
@@ -901,6 +893,7 @@ CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ANDROID_BINDERFS=y
 CONFIG_BINDER_OPT=y
+CONFIG_ANDROID_SIMPLE_LMK=y
 # CONFIG_NVMEM_SYSFS is not set
 CONFIG_QCOM_QFPROM=y
 CONFIG_NVMEM_SPMI_SDAM=y
@@ -951,7 +944,6 @@ CONFIG_PSTORE_RAM=y
 CONFIG_EROFS_FS=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
-CONFIG_UNICODE=y
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_HARDENED_USERCOPY=y
@@ -973,5 +965,6 @@ CONFIG_PRINTK_TIME=y
 CONFIG_FRAME_WARN=4096
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_PANIC_TIMEOUT=-1
+CONFIG_SCHEDSTATS=y
 CONFIG_FTRACE=y
 CONFIG_DEBUG_ALIGN_RODATA=y