[PATCH v6 13/33] KVM: s390: Prepare include guards for a new location

Christian Borntraeger borntraeger at linux.ibm.com
Wed Aug 12 10:35:19 PDT 2026



Am 12.08.26 um 17:36 schrieb Steffen Eiden:
> Update include guard names in dat.h, faultin.h, and gmap.h to
> ARCH_KVM_GMAP_* to reflect their upcoming relocation to a shared gmap
> directory.
> 
> No functional change.
> 
> Signed-off-by: Steffen Eiden <seiden at linux.ibm.com>


Reviewed-by: Christian Borntraeger <borntraeger at linux.ibm.com>

> ---
>   arch/s390/kvm/dat.h     | 6 +++---
>   arch/s390/kvm/faultin.h | 6 +++---
>   arch/s390/kvm/gmap.h    | 6 +++---
>   3 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/s390/kvm/dat.h b/arch/s390/kvm/dat.h
> index 141ee7b9f019..87108f51228e 100644
> --- a/arch/s390/kvm/dat.h
> +++ b/arch/s390/kvm/dat.h
> @@ -6,8 +6,8 @@
>    *    Author(s): Claudio Imbrenda <imbrenda at linux.ibm.com>
>    */
>   
> -#ifndef __KVM_S390_DAT_H
> -#define __KVM_S390_DAT_H
> +#ifndef ARCH_KVM_GMAP_DAT_H
> +#define ARCH_KVM_GMAP_DAT_H
>   
>   #include <linux/radix-tree.h>
>   #include <linux/refcount.h>
> @@ -975,4 +975,4 @@ static inline bool crste_is_ucas(union crste crste)
>   	return is_pmd(crste) && crste.h.i && crste.h.fc0.tl == 1 && crste.h.fc == 0;
>   }
>   
> -#endif /* __KVM_S390_DAT_H */
> +#endif /* ARCH_KVM_GMAP_DAT_H */
> diff --git a/arch/s390/kvm/faultin.h b/arch/s390/kvm/faultin.h
> index f86176d2769c..f343b6fb6f16 100644
> --- a/arch/s390/kvm/faultin.h
> +++ b/arch/s390/kvm/faultin.h
> @@ -6,8 +6,8 @@
>    *    Author(s): Claudio Imbrenda <imbrenda at linux.ibm.com>
>    */
>   
> -#ifndef __KVM_S390_FAULTIN_H
> -#define __KVM_S390_FAULTIN_H
> +#ifndef ARCH_KVM_GMAP_FAULTIN_H
> +#define ARCH_KVM_GMAP_FAULTIN_H
>   
>   #include <linux/kvm_host.h>
>   
> @@ -89,4 +89,4 @@ static inline int kvm_s390_get_guest_pages(struct kvm *kvm, struct guest_fault *
>   #define kvm_s390_array_needs_retry_safe(kvm, seq, array) \
>   	kvm_s390_multiple_faults_need_retry(kvm, seq, array, ARRAY_SIZE(array), false)
>   
> -#endif /* __KVM_S390_FAULTIN_H */
> +#endif /* ARCH_KVM_GMAP_FAULTIN_H */
> diff --git a/arch/s390/kvm/gmap.h b/arch/s390/kvm/gmap.h
> index 39938d363ec9..c54c35e47d6d 100644
> --- a/arch/s390/kvm/gmap.h
> +++ b/arch/s390/kvm/gmap.h
> @@ -7,8 +7,8 @@
>    *               Claudio Imbrenda <imbrenda at linux.ibm.com>
>    */
>   
> -#ifndef ARCH_KVM_S390_GMAP_H
> -#define ARCH_KVM_S390_GMAP_H
> +#ifndef ARCH_KVM_GMAP_GMAP_H
> +#define ARCH_KVM_GMAP_GMAP_H
>   
>   #include "dat.h"
>   
> @@ -330,4 +330,4 @@ static inline bool gmap_is_shadow_valid(struct gmap *sg, union asce asce, int ed
>   	return sg->guest_asce.val == asce.val && sg->edat_level == edat_level;
>   }
>   
> -#endif /* ARCH_KVM_S390_GMAP_H */
> +#endif /* ARCH_KVM_GMAP_GMAP_H */




More information about the linux-arm-kernel mailing list