]> git.baikalelectronics.ru Git - kernel.git/commit
powerpc/pseries: Fix build break due to pnv_npu2_init()
authorJason A. Donenfeld <Jason@zx2c4.com>
Tue, 15 Jan 2019 00:47:45 +0000 (16:47 -0800)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 15 Jan 2019 10:27:47 +0000 (21:27 +1100)
commitef98936264e20857c3dc0806739db7e4026c3e2e
treece2c6ec9533f70489b4bd15f744a74d2038df2ef
parentaadc3843c7e0e6a98ef2483d662ad80e1c68e763
powerpc/pseries: Fix build break due to pnv_npu2_init()

Commit 95c28e7d02c8 ("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: 95c28e7d02c8 ("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>
arch/powerpc/platforms/pseries/pci.c