mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
s390/boot: move uv function declarations to boot/uv.h
The functions adjust_to_uv_max() and uv_query_info() are used only in the decompressor. Therefore, move the function declarations from the global arch/s390/include/asm/uv.h to arch/s390/boot/uv.h. Signed-off-by: Alexander Egorenkov <egorenar@linux.ibm.com> Reviewed-by: Vasily Gorbik <gor@linux.ibm.com> Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
This commit is contained in:
parent
5492886c14
commit
c5cf505446
4 changed files with 20 additions and 8 deletions
|
@ -12,6 +12,7 @@
|
|||
#include <asm/uv.h>
|
||||
#include "compressed/decompressor.h"
|
||||
#include "boot.h"
|
||||
#include "uv.h"
|
||||
|
||||
unsigned long __bootdata_preserved(__kaslr_offset);
|
||||
unsigned long __bootdata_preserved(VMALLOC_START);
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
#include <asm/facility.h>
|
||||
#include <asm/sections.h>
|
||||
|
||||
#include "uv.h"
|
||||
|
||||
/* will be used in arch/s390/kernel/uv.c */
|
||||
#ifdef CONFIG_PROTECTED_VIRTUALIZATION_GUEST
|
||||
int __bootdata_preserved(prot_virt_guest);
|
||||
|
|
17
arch/s390/boot/uv.h
Normal file
17
arch/s390/boot/uv.h
Normal file
|
@ -0,0 +1,17 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
#ifndef BOOT_UV_H
|
||||
#define BOOT_UV_H
|
||||
|
||||
#if IS_ENABLED(CONFIG_KVM)
|
||||
void adjust_to_uv_max(unsigned long *vmax);
|
||||
#else
|
||||
static inline void adjust_to_uv_max(unsigned long *vmax) {}
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_PROTECTED_VIRTUALIZATION_GUEST) || IS_ENABLED(CONFIG_KVM)
|
||||
void uv_query_info(void);
|
||||
#else
|
||||
static inline void uv_query_info(void) {}
|
||||
#endif
|
||||
|
||||
#endif /* BOOT_UV_H */
|
|
@ -356,11 +356,9 @@ int uv_convert_from_secure(unsigned long paddr);
|
|||
int gmap_convert_to_secure(struct gmap *gmap, unsigned long gaddr);
|
||||
|
||||
void setup_uv(void);
|
||||
void adjust_to_uv_max(unsigned long *vmax);
|
||||
#else
|
||||
#define is_prot_virt_host() 0
|
||||
static inline void setup_uv(void) {}
|
||||
static inline void adjust_to_uv_max(unsigned long *vmax) {}
|
||||
|
||||
static inline int uv_destroy_page(unsigned long paddr)
|
||||
{
|
||||
|
@ -373,10 +371,4 @@ static inline int uv_convert_from_secure(unsigned long paddr)
|
|||
}
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_PROTECTED_VIRTUALIZATION_GUEST) || IS_ENABLED(CONFIG_KVM)
|
||||
void uv_query_info(void);
|
||||
#else
|
||||
static inline void uv_query_info(void) {}
|
||||
#endif
|
||||
|
||||
#endif /* _ASM_S390_UV_H */
|
||||
|
|
Loading…
Reference in a new issue