diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2019-01-14 16:47:45 -0800 |
|---|---|---|
| committer |   Michael Ellerman <mpe@ellerman.id.au> | 2019-01-15 21:27:47 +1100 |
| commit | da727097a482a93645ba5beea8d389ebab11fc64 (patch) | |
| tree | ce2c6ec9533f70489b4bd15f744a74d2038df2ef /arch/powerpc/platforms/pseries | |
| parent | powerpc/4xx/ocm: Fix fix for phys_addr_t printf warnings (diff) | |
| download | linux-dev-da727097a482a93645ba5beea8d389ebab11fc64.tar.xz linux-dev-da727097a482a93645ba5beea8d389ebab11fc64.zip | |
powerpc/pseries: Fix build break due to pnv_npu2_init()
Commit 3be2df00e299 ("powerpc/pseries/npu: Enable platform support")
added a call to pnv_npu2_init() in pseries code. This causes a build
break if we build with CONFIG_PPC_PSERIES && !CONFIG_PPC_POWERNV:
powerpc64le-pc-linux-gnu-ld: arch/powerpc/platforms/pseries/pci.o: in function `pSeries_final_fixup':
pci.c:(.init.text+0x1b0): undefined reference to `pnv_npu2_init'
This commit therefore wraps that line in an ifdef, so that pseries
builds without powernv.
Fixes: 3be2df00e299 ("powerpc/pseries/npu: Enable platform support")
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
[mpe: Frob change log a bit to blame a different commit]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/platforms/pseries')
| -rw-r--r-- | arch/powerpc/platforms/pseries/pci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/pseries/pci.c b/arch/powerpc/platforms/pseries/pci.c index 7725825d887d..37a77e57893e 100644 --- a/arch/powerpc/platforms/pseries/pci.c +++ b/arch/powerpc/platforms/pseries/pci.c @@ -264,7 +264,9 @@ void __init pSeries_final_fixup(void) if (!of_device_is_compatible(nvdn->parent, "ibm,power9-npu")) continue; +#ifdef CONFIG_PPC_POWERNV WARN_ON_ONCE(pnv_npu2_init(hose)); +#endif break; } } |