Skip to contentSkip to conversation

tooling fix

GIT PULL Ingo Molnar 1 participant 1 message Dec 15, 2017

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest perf-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-for-linus

# HEAD: 643e345c95f0b4a4082c60755e06e3e635658da6 tools/headers: Synchronize kernel <-> tooling headers

Synchronize kernel <-> tooling headers to resolve two build warnings in the perf build.

Thanks,

Ingo

------------------>
Ingo Molnar (1):

      tools/headers: Synchronize kernel <-> tooling headers
 tools/arch/x86/include/asm/cpufeatures.h | 1 +
 tools/include/uapi/linux/kvm.h           | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
tools/arch/x86/include/asm/cpufeatures.h +1 -0
index c0b0e9e8aa66..800104c8a3ed 100644
@@ -266,6 +266,7 @@
 /* AMD-defined CPU features, CPUID level 0x80000008 (EBX), word 13 */
 #define X86_FEATURE_CLZERO		(13*32+ 0) /* CLZERO instruction */
 #define X86_FEATURE_IRPERF		(13*32+ 1) /* Instructions Retired Count */
+#define X86_FEATURE_XSAVEERPTR		(13*32+ 2) /* Always save/restore FP error pointers */
 
 /* Thermal and Power Management Leaf, CPUID level 0x00000006 (EAX), word 14 */
 #define X86_FEATURE_DTHERM		(14*32+ 0) /* Digital Thermal Sensor */
tools/include/uapi/linux/kvm.h +2 -2
index 282d7613fce8..496e59a2738b 100644
@@ -630,9 +630,9 @@ struct kvm_s390_irq {
 
 struct kvm_s390_irq_state {
 	__u64 buf;
-	__u32 flags;
+	__u32 flags;        /* will stay unused for compatibility reasons */
 	__u32 len;
-	__u32 reserved[4];
+	__u32 reserved[4];  /* will stay unused for compatibility reasons */
 };
 
 /* for KVM_SET_GUEST_DEBUG */