From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752323AbeBEVgu (ORCPT ); Mon, 5 Feb 2018 16:36:50 -0500 Received: from terminus.zytor.com ([65.50.211.136]:51695 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752291AbeBEVgp (ORCPT ); Mon, 5 Feb 2018 16:36:45 -0500 Date: Mon, 5 Feb 2018 13:34:14 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: rkrcmar@redhat.com, dsahern@gmail.com, borntraeger@de.ibm.com, namhyung@kernel.org, hpa@zytor.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, wangnan0@huawei.com, acme@redhat.com, mingo@kernel.org, jolsa@kernel.org, adrian.hunter@intel.com Reply-To: namhyung@kernel.org, borntraeger@de.ibm.com, dsahern@gmail.com, rkrcmar@redhat.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com, wangnan0@huawei.com, acme@redhat.com, adrian.hunter@intel.com, jolsa@kernel.org, mingo@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] tooling headers: Synchronize updated s390 kvm UAPI headers Git-Commit-ID: 9a3853587c2bb0a38c2ce80a613ace5e84ae4337 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 9a3853587c2bb0a38c2ce80a613ace5e84ae4337 Gitweb: https://git.kernel.org/tip/9a3853587c2bb0a38c2ce80a613ace5e84ae4337 Author: Arnaldo Carvalho de Melo AuthorDate: Fri, 2 Feb 2018 16:43:45 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 2 Feb 2018 16:43:45 -0300 tooling headers: Synchronize updated s390 kvm UAPI headers The 35b3fde6203b ("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 Cc: Christian Borntraeger Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Radim Krčmář Cc: Wang Nan Link: https://lkml.kernel.org/n/tip-kif2fdkcaewj8iqw6lwyil8s@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/arch/s390/include/uapi/asm/kvm.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/arch/s390/include/uapi/asm/kvm.h b/tools/arch/s390/include/uapi/asm/kvm.h index 38535a57..4cdaa55 100644 --- a/tools/arch/s390/include/uapi/asm/kvm.h +++ b/tools/arch/s390/include/uapi/asm/kvm.h @@ -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 {