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

Commit 3fba3614 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf tooling fix from Ingo Molnar:
 "Synchronize kernel <-> tooling headers to resolve two build warnings
  in the perf build"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tools/headers: Synchronize kernel <-> tooling headers
parents 35d57884 643e345c

tools/arch/x86/include/asm/cpufeatures.h

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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 */