git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From e54fad8044db18cc400df8d01bfb86cada08b7cb Mon Sep 17 00:00:00 2001
   2 From: Zheng Bin <zhengbin13@huawei.com>
   3 Date: Thu, 27 Oct 2022 17:59:04 +0800
   4 Subject: slimbus: qcom-ngd: Fix build error when CONFIG_SLIM_QCOM_NGD_CTRL=y && CONFIG_QCOM_RPROC_COMMON=m
   5
   6 From: Zheng Bin <zhengbin13@huawei.com>
   7
   8 commit e54fad8044db18cc400df8d01bfb86cada08b7cb upstream.
   9
  10 If CONFIG_SLIM_QCOM_NGD_CTRL=y, CONFIG_QCOM_RPROC_COMMON=m, COMPILE_TEST=y,
  11 bulding fails:
  12
  13 drivers/slimbus/qcom-ngd-ctrl.o: In function `qcom_slim_ngd_ctrl_probe':
  14 qcom-ngd-ctrl.c:(.text+0x330): undefined reference to `qcom_register_ssr_notifier'
  15 qcom-ngd-ctrl.c:(.text+0x5fc): undefined reference to `qcom_unregister_ssr_notifier'
  16 drivers/slimbus/qcom-ngd-ctrl.o: In function `qcom_slim_ngd_remove':
  17 qcom-ngd-ctrl.c:(.text+0x90c): undefined reference to `qcom_unregister_ssr_notifier'
  18
  19 Make SLIM_QCOM_NGD_CTRL depends on QCOM_RPROC_COMMON || (COMPILE_TEST && !QCOM_RPROC_COMMON) to fix this.
  20
  21 Fixes: e291691c6977 ("slimbus: qcom-ngd-ctrl: allow compile testing without QCOM_RPROC_COMMON")
  22 Cc: stable <stable@kernel.org>
  23 Signed-off-by: Zheng Bin <zhengbin13@huawei.com>
  24 Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
  25 Link: https://lore.kernel.org/r/20221027095904.3388959-1-zhengbin13@huawei.com
  26 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  27 ---
  28  drivers/slimbus/Kconfig | 2 +-
  29  1 file changed, 1 insertion(+), 1 deletion(-)
  30
  31 diff --git a/drivers/slimbus/Kconfig b/drivers/slimbus/Kconfig
  32 index 2ed821f75816..a0fdf9d792cb 100644
  33 --- a/drivers/slimbus/Kconfig
  34 +++ b/drivers/slimbus/Kconfig
  35 @@ -23,7 +23,7 @@ config SLIM_QCOM_CTRL
  36  config SLIM_QCOM_NGD_CTRL
  37         tristate "Qualcomm SLIMbus Satellite Non-Generic Device Component"
  38         depends on HAS_IOMEM && DMA_ENGINE && NET
  39 -       depends on QCOM_RPROC_COMMON || COMPILE_TEST
  40 +       depends on QCOM_RPROC_COMMON || (COMPILE_TEST && !QCOM_RPROC_COMMON)
  41         depends on ARCH_QCOM || COMPILE_TEST
  42         select QCOM_QMI_HELPERS
  43         select QCOM_PDR_HELPERS
  44 --
  45 2.38.1
  46