diff options
| author | Yong Ding <yongding@codeaurora.org> | 2018-06-28 11:09:46 +0800 |
|---|---|---|
| committer | Yong Ding <yongding@codeaurora.org> | 2018-06-28 11:51:07 +0800 |
| commit | 57f26563aaed6352bee05c166cc1d939db647a31 (patch) | |
| tree | 75f439277a0f53c981107878dce2aa9ebd6ccad8 | |
| parent | e130a419a73ab080f845d1ffcc8b3e63d6738535 (diff) | |
soc: qcom: hab: resolve some compilation issues
hab_qvm.h and its relevant stuffs are
only available when CONFIG_MSM_GVM_QUIN is enabled.
Change-Id: I7975f65f0f5bc627b7547c05245a37d4e6500c81
Signed-off-by: Yong Ding <yongding@codeaurora.org>
| -rw-r--r-- | drivers/soc/qcom/hab/hab_ghs.c | 2 | ||||
| -rw-r--r-- | drivers/soc/qcom/hab/khab_test.c | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/drivers/soc/qcom/hab/hab_ghs.c b/drivers/soc/qcom/hab/hab_ghs.c index 11fd6bb92a90..e743d9b00a66 100644 --- a/drivers/soc/qcom/hab/hab_ghs.c +++ b/drivers/soc/qcom/hab/hab_ghs.c @@ -40,7 +40,7 @@ static const char * const dt_gipc_path_name[] = { }; static struct ghs_vmm_plugin_info_s { - const char **dt_name; + const char * const *dt_name; int curr; int probe_cnt; } ghs_vmm_plugin_info = { diff --git a/drivers/soc/qcom/hab/khab_test.c b/drivers/soc/qcom/hab/khab_test.c index 0b71054ad38f..7d6df8861421 100644 --- a/drivers/soc/qcom/hab/khab_test.c +++ b/drivers/soc/qcom/hab/khab_test.c @@ -13,7 +13,9 @@ #include "hab.h" #include "khab_test.h" #include "hab_pipe.h" +#ifdef CONFIG_MSM_GVM_QUIN #include "hab_qvm.h" +#endif #include <asm/cacheflush.h> #include <linux/list.h> @@ -30,8 +32,10 @@ enum hab_perf_test_type { static int hab_shmm_throughput_test(void) { struct hab_device *habDev; +#ifdef CONFIG_MSM_GVM_QUIN struct qvm_channel *dev; - struct hab_shared_buf *sh_buf; +#endif + struct hab_shared_buf *sh_buf = NULL; struct physical_channel *pchan; struct timeval tv1, tv2; int i, counter; @@ -52,6 +56,7 @@ static int hab_shmm_throughput_test(void) pchan = list_first_entry(&(habDev->pchannels), struct physical_channel, node); +#ifdef CONFIG_MSM_GVM_QUIN dev = pchan->hyp_data; if (!dev) { ret = -EPERM; @@ -59,6 +64,8 @@ static int hab_shmm_throughput_test(void) } sh_buf = dev->pipe_ep->tx_info.sh_buf; +#endif + /* pChannel is of 128k, we use 64k to test */ size = 0x10000; |