From 91e3da89cb81c18c2739245f5bd74406f959e125 Mon Sep 17 00:00:00 2001 From: Jayasri Bhattacharyya Date: Wed, 17 Aug 2022 18:40:29 +0530 Subject: [PATCH] securemam-kernel: Change the scope of CONFIG_QSEECOM Export get_client_env_object when CONFIG_QSEECOM is enabled Change-Id: I1a52d6e86c8bc75436df55a91759b251caeaa051 --- smcinvoke/smcinvoke_kernel.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/smcinvoke/smcinvoke_kernel.c b/smcinvoke/smcinvoke_kernel.c index 46a292613c..96032544a6 100644 --- a/smcinvoke/smcinvoke_kernel.c +++ b/smcinvoke/smcinvoke_kernel.c @@ -3,7 +3,6 @@ * Copyright (c) 2021, The Linux Foundation. All rights reserved. * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. */ -#if !IS_ENABLED(CONFIG_QSEECOM) #include #include #include @@ -14,12 +13,15 @@ #include #include #include "smcinvoke.h" -#include "linux/qseecom.h" #include "smcinvoke_object.h" +#include "IClientEnv.h" + +#if !IS_ENABLED(CONFIG_QSEECOM) +#include "linux/qseecom.h" #include "misc/qseecom_kernel.h" #include "IQSEEComCompat.h" #include "IQSEEComCompatAppLoader.h" -#include "IClientEnv.h" +#endif const uint32_t CQSEEComCompatAppLoader_UID = 122; @@ -302,6 +304,8 @@ int32_t get_client_env_object(struct Object *clientEnvObj) } EXPORT_SYMBOL(get_client_env_object); +#if !IS_ENABLED(CONFIG_QSEECOM) + static int load_app(struct qseecom_compat_context *cxt, const char *app_name) { size_t fw_size = 0;