On 23.04.20 14:01, Claudio Imbrenda wrote:
> The kernel fails to compile with CONFIG_PROTECTED_VIRTUALIZATION_GUEST
> set but CONFIG_KVM unset.
>
> This patch fixes the issue by making the needed variable always available.
>
> Fixes: a0f60f8431999bf5 ("s390/protvirt: Add sysfs firmware interface for Ultravisor information")
> Reported-by: kbuild test robot <lkp@xxxxxxxxx>
> Reported-by: Philipp Rudo <prudo@xxxxxxxxxxxxx>
> Suggested-by: Philipp Rudo <prudo@xxxxxxxxxxxxx>
> CC: Vasily Gorbik <gor@xxxxxxxxxxxxx>
> Signed-off-by: Claudio Imbrenda <imbrenda@xxxxxxxxxxxxx>
> ---
> arch/s390/boot/uv.c | 2 --
> arch/s390/kernel/uv.c | 3 ++-
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/arch/s390/boot/uv.c b/arch/s390/boot/uv.c
> index 8fde561f1d07..f887a479cdc7 100644
> --- a/arch/s390/boot/uv.c
> +++ b/arch/s390/boot/uv.c
> @@ -7,9 +7,7 @@
> #ifdef CONFIG_PROTECTED_VIRTUALIZATION_GUEST
> int __bootdata_preserved(prot_virt_guest);
> #endif
> -#if IS_ENABLED(CONFIG_KVM)
> struct uv_info __bootdata_preserved(uv_info);
> -#endif
>
> void uv_query_info(void)
> {
> diff --git a/arch/s390/kernel/uv.c b/arch/s390/kernel/uv.c
> index c86d654351d1..4c0677fc8904 100644
> --- a/arch/s390/kernel/uv.c
> +++ b/arch/s390/kernel/uv.c
> @@ -23,10 +23,11 @@
> int __bootdata_preserved(prot_virt_guest);
> #endif
>
> +struct uv_info __bootdata_preserved(uv_info);
> +
> #if IS_ENABLED(CONFIG_KVM)
> int prot_virt_host;
> EXPORT_SYMBOL(prot_virt_host);
> -struct uv_info __bootdata_preserved(uv_info);
> EXPORT_SYMBOL(uv_info);
>
> static int __init prot_virt_setup(char *val)
>
Reviewed-by: David Hildenbrand <david@xxxxxxxxxx>
--
Thanks,
David / dhildenb
