queue-5.1/edac-mpc85xx-prevent-building-as-a-module.patch

   1 From 4f6e626128b651ab053f281af059eff6999a1fc5 Mon Sep 17 00:00:00 2001
   2 From: Michael Ellerman <mpe@ellerman.id.au>
   3 Date: Fri, 3 May 2019 00:19:41 +1000
   4 Subject: EDAC/mpc85xx: Prevent building as a module
   5
   6 [ Upstream commit 2b8358a951b1e2a534a54924cd8245e58a1c5fb8 ]
   7
   8 The mpc85xx EDAC driver can be configured as a module but then fails to
   9 build because it uses two unexported symbols:
  10
  11   ERROR: ".pci_find_hose_for_OF_device" [drivers/edac/mpc85xx_edac_mod.ko] undefined!
  12   ERROR: ".early_find_capability" [drivers/edac/mpc85xx_edac_mod.ko] undefined!
  13
  14 We don't want to export those symbols just for this driver, so make the
  15 driver only configurable as a built-in.
  16
  17 This seems to have been broken since at least
  18
  19   c92132f59806 ("edac/85xx: Add PCIe error interrupt edac support")
  20
  21 (Nov 2013).
  22
  23  [ bp: make it depend on EDAC=y so that the EDAC core doesn't get built
  24    as a module. ]
  25
  26 Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
  27 Signed-off-by: Borislav Petkov <bp@suse.de>
  28 Acked-by: Johannes Thumshirn <jth@kernel.org>
  29 Cc: James Morse <james.morse@arm.com>
  30 Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
  31 Cc: linux-edac <linux-edac@vger.kernel.org>
  32 Cc: linuxppc-dev@ozlabs.org
  33 Cc: morbidrsa@gmail.com
  34 Link: https://lkml.kernel.org/r/20190502141941.12927-1-mpe@ellerman.id.au
  35 Signed-off-by: Sasha Levin <sashal@kernel.org>
  36 ---
  37  drivers/edac/Kconfig | 4 ++--
  38  1 file changed, 2 insertions(+), 2 deletions(-)
  39
  40 diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
  41 index 47eb4d13ed5f..5e2e0348d460 100644
  42 --- a/drivers/edac/Kconfig
  43 +++ b/drivers/edac/Kconfig
  44 @@ -263,8 +263,8 @@ config EDAC_PND2
  45           micro-server but may appear on others in the future.
  46
  47  config EDAC_MPC85XX
  48 -       tristate "Freescale MPC83xx / MPC85xx"
  49 -       depends on FSL_SOC
  50 +       bool "Freescale MPC83xx / MPC85xx"
  51 +       depends on FSL_SOC && EDAC=y
  52         help
  53           Support for error detection and correction on the Freescale
  54           MPC8349, MPC8560, MPC8540, MPC8548, T4240
  55 --
  56 2.20.1
  57