Commit da727097 authored Jan 14, 2019 by Jason A. Donenfeld Committed by Michael Ellerman Jan 15, 2019

powerpc/pseries: Fix build break due to pnv_npu2_init()



Commit 3be2df00 ("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: 3be2df00 ("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>

parent fcf5036f

arch/powerpc/platforms/pseries/pci.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}