• Paul Mackerras's avatar
    KVM: PPC: Fix compile error that occurs when CONFIG_ALTIVEC=n · c662f773
    Paul Mackerras authored
    Commit accb757d ("KVM: Move vcpu_load to arch-specific
    kvm_arch_vcpu_ioctl_run", 2017-12-04) added a "goto out"
    statement and an "out:" label to kvm_arch_vcpu_ioctl_run().
    Since the only "goto out" is inside a CONFIG_VSX block,
    compiling with CONFIG_VSX=n gives a warning that label "out"
    is defined but not used, and because arch/powerpc is compiled
    with -Werror, that becomes a compile error that makes the kernel
    build fail.
    
    Merge commit 1ab03c07 ("Merge tag 'kvm-ppc-next-4.16-2' of
    git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc",
    2018-02-09) added a similar block of code inside a #ifdef
    CONFIG_ALTIVEC, with a "goto out" statement.
    
    In order to make the build succeed, this adds a #ifdef around the
    "out:" label.  This is a minimal, ugly fix, to be replaced later
    by a refactoring of the code.  Since CONFIG_VSX depends on
    CONFIG_ALTIVEC, it is sufficient to use #ifdef CONFIG_ALTIVEC here.
    
    Fixes: accb757d ("KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_run")
    Reported-by: default avatarChristian Zigotzky <chzigotzky@xenosoft.de>
    Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
    c662f773
powerpc.c 49.8 KB