From ed83f265a5f3fc466080cac01b815ed974414c15 Mon Sep 17 00:00:00 2001 From: Quentin Perret Date: Wed, 7 Dec 2022 17:50:33 +0000 Subject: [PATCH] ANDROID: KVM: arm64: Fix link with CONFIG_MODULES=n The recently introduced support for pKVM modules has clearly lacked a bit of testing with CONFIG_MODULES=n. Make sure to not access __pkvm_modules_enabled when CONFIG_MODULES=n to fix the link. Bug: 244543039 Bug: 244373730 Reported-by: kernel test robot Change-Id: I65c6ad7c07c2812b85dcd435b24b3444c0ce7f1e Signed-off-by: Quentin Perret --- arch/arm64/kvm/pkvm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/kvm/pkvm.c b/arch/arm64/kvm/pkvm.c index 8800c4865651..f53776f04a95 100644 --- a/arch/arm64/kvm/pkvm.c +++ b/arch/arm64/kvm/pkvm.c @@ -416,6 +416,7 @@ int pkvm_vm_ioctl_enable_cap(struct kvm *kvm, struct kvm_enable_cap *cap) return 0; } +#ifdef CONFIG_MODULES static int __init early_pkvm_enable_modules(char *arg) { kvm_nvhe_sym(__pkvm_modules_enabled) = true; @@ -423,6 +424,7 @@ static int __init early_pkvm_enable_modules(char *arg) return 0; } early_param("kvm-arm.protected_modules", early_pkvm_enable_modules); +#endif struct pkvm_mod_sec_mapping { struct pkvm_module_section *sec;