Skip to content

Commit 673deb0

Browse files
Claudio ImbrendaVasily Gorbik
authored andcommitted
s390/protvirt: fix compilation issue
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. Link: https://lkml.kernel.org/r/[email protected] Fixes: a0f60f8 ("s390/protvirt: Add sysfs firmware interface for Ultravisor information") Reported-by: kbuild test robot <[email protected]> Reported-by: Philipp Rudo <[email protected]> Suggested-by: Philipp Rudo <[email protected]> Reviewed-by: David Hildenbrand <[email protected]> Reviewed-by: Cornelia Huck <[email protected]> Reviewed-by: Vasily Gorbik <[email protected]> Acked-by: Christian Borntraeger <[email protected]> Signed-off-by: Claudio Imbrenda <[email protected]> Signed-off-by: Vasily Gorbik <[email protected]>
1 parent 86dbf32 commit 673deb0

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

arch/s390/boot/uv.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
#ifdef CONFIG_PROTECTED_VIRTUALIZATION_GUEST
88
int __bootdata_preserved(prot_virt_guest);
99
#endif
10-
#if IS_ENABLED(CONFIG_KVM)
1110
struct uv_info __bootdata_preserved(uv_info);
12-
#endif
1311

1412
void uv_query_info(void)
1513
{

arch/s390/kernel/uv.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@
2323
int __bootdata_preserved(prot_virt_guest);
2424
#endif
2525

26+
struct uv_info __bootdata_preserved(uv_info);
27+
2628
#if IS_ENABLED(CONFIG_KVM)
2729
int prot_virt_host;
2830
EXPORT_SYMBOL(prot_virt_host);
29-
struct uv_info __bootdata_preserved(uv_info);
3031
EXPORT_SYMBOL(uv_info);
3132

3233
static int __init prot_virt_setup(char *val)

0 commit comments

Comments
 (0)