From 4a5826e549a3bd3bc3d81e19a1e2420f5f2070ef Mon Sep 17 00:00:00 2001 From: Neill Kapron Date: Thu, 9 Mar 2023 16:54:45 +0000 Subject: [PATCH] Revert "ANDROID: disble the UID_SYS_STATS driver" This reverts commit d5c66205c27e16c306a6e40ec1cbbc8813c95590, which disabled the uid_sys_stats driver in Android due to required hooks being removed in the upstream kernel. Bug: 219790626 Signed-off-by: Neill Kapron (cherry picked from https://android-review.googlesource.com/q/commit:81c66411108db1993c1fb1b09c9d935588c8a5b4) Merged-In: I8398b1d711eee800520210c669c0022f4b660d03 Change-Id: I8398b1d711eee800520210c669c0022f4b660d03 --- arch/arm64/configs/gki_defconfig | 1 + arch/x86/configs/gki_defconfig | 1 + drivers/misc/Kconfig | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 20f55fabf909..058f8b3ea096 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -308,6 +308,7 @@ CONFIG_BLK_DEV_UBLK=y CONFIG_BLK_DEV_NVME=y CONFIG_NVME_MULTIPATH=y CONFIG_SRAM=y +CONFIG_UID_SYS_STATS=y CONFIG_SCSI=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index af0e6136cb16..d29dee4058d3 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -296,6 +296,7 @@ CONFIG_BLK_DEV_UBLK=y CONFIG_BLK_DEV_NVME=y CONFIG_NVME_MULTIPATH=y CONFIG_SRAM=y +CONFIG_UID_SYS_STATS=y CONFIG_SCSI=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 22febcbb9e36..1cf7846573a0 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -486,7 +486,6 @@ config MISC_RTSX config UID_SYS_STATS bool "Per-UID statistics" depends on PROFILING && TASK_XACCT && TASK_IO_ACCOUNTING - depends on BROKEN help Per UID based cpu time statistics exported to /proc/uid_cputime Per UID based io statistics exported to /proc/uid_io