build failure of current mmotm with skiroot_defconfig

[Paul Mackerras]

On Wed, Feb 27, 2019 at 07:41:21AM +0100, Christophe Leroy wrote:
> 
> 
> Le 26/02/2019 à 23:24, Paul Mackerras a écrit :
> >On Tue, Feb 26, 2019 at 11:59:08AM +0200, Mike Rapoport wrote:
> >>On Tue, Feb 26, 2019 at 10:39:54AM +0100, Christophe Leroy wrote:
> >>>
> >>>
> >>>Le 26/02/2019 à 09:12, Mike Rapoport a écrit :
> >>>>Hi,
> >>>>
> >>>>I've encountered the following error when building skyroot_defconfig with
> >>>>current mmotm tree:
> >>>>
> >>>>make CONFIG_OF_ALL_DTBS=y CONFIG_DTC=y CROSS_COMPILE=/opt/gcc-8.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ARCH=powerpc vmlinux
> >>>>   ...
> >>>>   CC      arch/powerpc/kernel/dbell.o
> >>>>In file included from arch/powerpc/kernel/dbell.c:20:
> >>>>arch/powerpc/include/asm/kvm_ppc.h: In function 'xics_on_xive':
> >>>>arch/powerpc/include/asm/kvm_ppc.h:625:9: error: implicit declaration of function 'xive_enabled'; did you mean 'eeh_enabled'? [-Werror=implicit-function-declaration]
> >>>>   return xive_enabled() && cpu_has_feature(CPU_FTR_HVMODE);
> >>>>          ^~~~~~~~~~~~
> >>>>          eeh_enabled
> >>>
> >>>I can neither find the above in arch/powerpc/include/asm/kvm_ppc.h in the
> >>>powerpc tree, nor a patch removing it.
> >>>
> >>>Where does that comes from ?
> >>
> >>It's from current mmotm, probably some merge conflict...
> >
> >It's not a merge conflict; see http://patchwork.ozlabs.org/patch/1048584/
> >for the fix.
> >
> 
> Why not include asm/xive.h all the time, as it defines xive_enabled() for
> when CONFIG_PPC_XIVE is set and for when it is not set ?

I wasn't sure it wouldn't break the build for 32-bit configs.

Paul.