From bc9ec2e207d66f035e393e97b97f5926bb5139ca Mon Sep 17 00:00:00 2001 From: Steve Muckle Date: Fri, 7 Jan 2022 18:27:56 +0000 Subject: [PATCH] ANDROID: GKI: enable test_stackinit kernel module Bug: 181024194 Change-Id: Ib7f9ea287fea7d27a87cdf549d0c4914317f8e56 Signed-off-by: Steve Muckle --- android/gki_aarch64_modules | 1 + arch/arm64/configs/gki_defconfig | 2 +- arch/x86/configs/gki_defconfig | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 android/gki_aarch64_modules diff --git a/android/gki_aarch64_modules b/android/gki_aarch64_modules new file mode 100644 index 000000000000..a6c3f332d9c3 --- /dev/null +++ b/android/gki_aarch64_modules @@ -0,0 +1 @@ +lib/test_stackinit.ko diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index c12393f95014..a1d7d4a8d609 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -680,4 +680,4 @@ CONFIG_HIST_TRIGGERS=y CONFIG_PID_IN_CONTEXTIDR=y CONFIG_KUNIT=y CONFIG_KUNIT_DEBUGFS=y -# CONFIG_RUNTIME_TESTING_MENU is not set +CONFIG_TEST_STACKINIT=m diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 348385db498c..9cac3225313b 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -617,3 +617,4 @@ CONFIG_HIST_TRIGGERS=y CONFIG_UNWINDER_FRAME_POINTER=y CONFIG_KUNIT=y CONFIG_KUNIT_DEBUGFS=y +CONFIG_TEST_STACKINIT=m