Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a385358 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tooling headers: Synchronize updated s390 kvm UAPI headers 

The 35b3fde6 ("KVM: s390: wire up bpb feature") was noticed by the
perf build process:

  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'

The changes in this cset don't cause or require changes in tools/perf/,
so just update the copy to silence the build warning.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-kif2fdkcaewj8iqw6lwyil8s@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 6bc7626c

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

+4 −1
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ struct kvm_guest_debug_arch { 
#define KVM_SYNC_RICCB  (1UL << 7)

#define KVM_SYNC_FPRS   (1UL << 8)

#define KVM_SYNC_GSCB   (1UL << 9)

#define KVM_SYNC_BPBC   (1UL << 10)

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

#define SDNXC 8

#define SDNXL (1UL << SDNXC)
@@ -247,7 +248,9 @@ struct kvm_sync_regs { 
	};

	__u8  reserved[512];	/* for future vector expansion */

	__u32 fpc;		/* valid on KVM_SYNC_VRS or KVM_SYNC_FPRS */

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

	__u8 bpbc : 1;		/* bp mode */

	__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 */

	union {