From 094f5702db8686e9736e799cab89a2e5778a3d86 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 12 Apr 2022 18:25:22 +0200 Subject: [PATCH] ANDROID: debug_kinfo driver, move to drivers/android drivers/staging/android is going away, and systems seem to be relying on this driver now, so move it into drivers/android/ to make everything self-contained and prevent merge issues later on. Bug: 170851792 Bug: 169101608 Cc: Jone Chou Cc: Will McVicker Signed-off-by: Greg Kroah-Hartman Change-Id: Ib969a7544ea74881da61d7cba1f529a269921049 --- arch/arm64/configs/gki_defconfig | 2 +- arch/x86/configs/gki_defconfig | 2 +- drivers/android/Kconfig | 11 +++++++++++ drivers/android/Makefile | 1 + drivers/{staging => }/android/debug_kinfo.c | 0 drivers/{staging => }/android/debug_kinfo.h | 0 drivers/staging/android/Kconfig | 11 ----------- drivers/staging/android/Makefile | 1 - 8 files changed, 14 insertions(+), 14 deletions(-) rename drivers/{staging => }/android/debug_kinfo.c (100%) rename drivers/{staging => }/android/debug_kinfo.h (100%) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index db3a11ec34fd..acd165cf474b 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -516,7 +516,6 @@ CONFIG_UIO=y CONFIG_VHOST_VSOCK=y CONFIG_STAGING=y CONFIG_ASHMEM=y -CONFIG_DEBUG_KINFO=y CONFIG_COMMON_CLK_SCPI=y # CONFIG_CLK_SUNXI is not set # CONFIG_SUNXI_CCU is not set @@ -543,6 +542,7 @@ CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y CONFIG_ANDROID_BINDERFS=y CONFIG_ANDROID_VENDOR_HOOKS=y +CONFIG_ANDROID_DEBUG_KINFO=y CONFIG_LIBNVDIMM=y # CONFIG_ND_BLK is not set CONFIG_INTERCONNECT=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index b946b4b3aacf..2bd73fe7bf5a 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -469,7 +469,6 @@ CONFIG_UIO=y CONFIG_VHOST_VSOCK=y CONFIG_STAGING=y CONFIG_ASHMEM=y -CONFIG_DEBUG_KINFO=y CONFIG_REMOTEPROC=y CONFIG_REMOTEPROC_CDEV=y CONFIG_RPMSG_CHAR=y @@ -482,6 +481,7 @@ CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y CONFIG_ANDROID_BINDERFS=y CONFIG_ANDROID_VENDOR_HOOKS=y +CONFIG_ANDROID_DEBUG_KINFO=y CONFIG_LIBNVDIMM=y # CONFIG_ND_BLK is not set CONFIG_INTERCONNECT=y diff --git a/drivers/android/Kconfig b/drivers/android/Kconfig index 32fb9e5b6195..b4d83a2800a2 100644 --- a/drivers/android/Kconfig +++ b/drivers/android/Kconfig @@ -63,6 +63,17 @@ config ANDROID_VENDOR_HOOKS Allow vendor modules to attach to tracepoint "hooks" defined via DECLARE_HOOK or DECLARE_RESTRICTED_HOOK. +config ANDROID_DEBUG_KINFO + bool "Android Debug Kernel Information Support" + depends on KALLSYMS + help + This supports kernel information backup for bootloader usage. + Specifics: + - The kallsyms symbols for unwind_backtrace + - Page directory pointer + - UTS_RELEASE + - BUILD_INFO(ro.build.fingerprint) + endif # if ANDROID endmenu diff --git a/drivers/android/Makefile b/drivers/android/Makefile index d488047415a0..9b89e4ba00a1 100644 --- a/drivers/android/Makefile +++ b/drivers/android/Makefile @@ -5,3 +5,4 @@ obj-$(CONFIG_ANDROID_BINDERFS) += binderfs.o obj-$(CONFIG_ANDROID_BINDER_IPC) += binder.o binder_alloc.o obj-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o obj-$(CONFIG_ANDROID_VENDOR_HOOKS) += vendor_hooks.o +obj-$(CONFIG_ANDROID_DEBUG_KINFO) += debug_kinfo.o diff --git a/drivers/staging/android/debug_kinfo.c b/drivers/android/debug_kinfo.c similarity index 100% rename from drivers/staging/android/debug_kinfo.c rename to drivers/android/debug_kinfo.c diff --git a/drivers/staging/android/debug_kinfo.h b/drivers/android/debug_kinfo.h similarity index 100% rename from drivers/staging/android/debug_kinfo.h rename to drivers/android/debug_kinfo.h diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig index 9aca9ce10f8a..70498adb1575 100644 --- a/drivers/staging/android/Kconfig +++ b/drivers/staging/android/Kconfig @@ -14,17 +14,6 @@ config ASHMEM It is, in theory, a good memory allocator for low-memory devices, because it can discard shared memory units when under memory pressure. -config DEBUG_KINFO - bool "Debug Kernel Information Support" - depends on KALLSYMS - help - This supports kernel information backup for bootloader usage. - Specifics: - - The kallsyms symbols for unwind_backtrace - - Page directory pointer - - UTS_RELEASE - - BUILD_INFO(ro.build.fingerprint) - endif # if ANDROID endmenu diff --git a/drivers/staging/android/Makefile b/drivers/staging/android/Makefile index b92c5fe69bad..e9a55a5e6529 100644 --- a/drivers/staging/android/Makefile +++ b/drivers/staging/android/Makefile @@ -2,4 +2,3 @@ ccflags-y += -I$(src) # needed for trace events obj-$(CONFIG_ASHMEM) += ashmem.o -obj-$(CONFIG_DEBUG_KINFO) += debug_kinfo.o