diff options
| author | Claudio Imbrenda <[email protected]> | 2020-04-23 14:01:14 +0200 |
|---|---|---|
| committer | Vasily Gorbik <[email protected]> | 2020-04-25 10:17:24 +0200 |
| commit | 673deb0beba5d39c2e0bc6536e00b03b6ef59cc0 (patch) | |
| tree | 9b5740c52a40cfbcefeef452bfc48a59df1f9e68 | |
| parent | 86dbf32da150339ca81509fa2eb84c814b55258b (diff) | |
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: a0f60f843199 ("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]>
| -rw-r--r-- | arch/s390/boot/uv.c | 2 | ||||
| -rw-r--r-- | 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) |