Commit 23db762b authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools headers kvm s390: Sync headers with the kernel sources 



To pick the changes in:

  23a60f83 ("s390/kvm: diagnose 0x318 sync and reset")

None of them trigger any changes in tooling, this time this is just to silence
these perf build warnings:

  Warning: Kernel ABI header at 'tools/arch/s390/include/uapi/asm/kvm.h' differs from latest version at 'arch/s390/include/uapi/asm/kvm.h'
  diff -u tools/arch/s390/include/uapi/asm/kvm.h arch/s390/include/uapi/asm/kvm.h

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Collin Walling <walling@linux.ibm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent f3cf7fa9

tools/arch/s390/include/uapi/asm/kvm.h

+5 −2
Original line number Diff line number Diff line
@@ -231,11 +231,13 @@ struct kvm_guest_debug_arch { 
#define KVM_SYNC_GSCB   (1UL << 9)

#define KVM_SYNC_BPBC   (1UL << 10)

#define KVM_SYNC_ETOKEN (1UL << 11)

#define KVM_SYNC_DIAG318 (1UL << 12)



#define KVM_SYNC_S390_VALID_FIELDS \

	(KVM_SYNC_PREFIX | KVM_SYNC_GPRS | KVM_SYNC_ACRS | KVM_SYNC_CRS | \

	 KVM_SYNC_ARCH0 | KVM_SYNC_PFAULT | KVM_SYNC_VRS | KVM_SYNC_RICCB | \

	 KVM_SYNC_FPRS | KVM_SYNC_GSCB | KVM_SYNC_BPBC | KVM_SYNC_ETOKEN)

	 KVM_SYNC_FPRS | KVM_SYNC_GSCB | KVM_SYNC_BPBC | KVM_SYNC_ETOKEN | \

	 KVM_SYNC_DIAG318)



/* length and alignment of the sdnx as a power of two */

#define SDNXC 8
@@ -264,7 +266,8 @@ struct kvm_sync_regs { 
	__u8 reserved2 : 7;

	__u8 padding1[51];	/* riccb needs to be 64byte aligned */

	__u8 riccb[64];		/* runtime instrumentation controls block */

	__u8 padding2[192];	/* sdnx needs to be 256byte aligned */

	__u64 diag318;		/* diagnose 0x318 info */

	__u8 padding2[184];	/* sdnx needs to be 256byte aligned */

	union {

		__u8 sdnx[SDNXL];  /* state description annex */

		struct {