diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2024-04-19 16:34:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2024-04-19 16:34:10 -0700 |
| commit | 13a2e429f644691fca70049ea1c75f135957c788 (patch) | |
| tree | 5d2fd869bc573719919ad00e2c419ae002238323 /tools/arch/x86/include/asm/required-features.h | |
| parent | Merge tag 'hardening-v6.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | tools/include: Sync arm64 asm/cputype.h with the kernel sources (diff) | |
| download | linux-13a2e429f644691fca70049ea1c75f135957c788.tar.gz linux-13a2e429f644691fca70049ea1c75f135957c788.tar.bz2 linux-13a2e429f644691fca70049ea1c75f135957c788.zip | |
Merge tag 'perf-tools-fixes-for-v6.9-2024-04-19' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools
Pull perf tools fixes from Namhyung Kim:
"A random set of small bug fixes:
- Fix perf annotate TUI when used with data type profiling
- Work around BPF verifier about sighand lock checking
And a set of kernel header synchronization"
* tag 'perf-tools-fixes-for-v6.9-2024-04-19' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools:
tools/include: Sync arm64 asm/cputype.h with the kernel sources
tools/include: Sync asm-generic/bitops/fls.h with the kernel sources
tools/include: Sync x86 asm/msr-index.h with the kernel sources
tools/include: Sync x86 asm/irq_vectors.h with the kernel sources
tools/include: Sync x86 CPU feature headers with the kernel sources
tools/include: Sync uapi/sound/asound.h with the kernel sources
tools/include: Sync uapi/linux/kvm.h and asm/kvm.h with the kernel sources
tools/include: Sync uapi/linux/fs.h with the kernel sources
tools/include: Sync uapi/drm/i915_drm.h with the kernel sources
perf lock contention: Add a missing NULL check
perf annotate: Make sure to call symbol__annotate2() in TUI
Diffstat (limited to 'tools/arch/x86/include/asm/required-features.h')
| -rw-r--r-- | tools/arch/x86/include/asm/required-features.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/arch/x86/include/asm/required-features.h b/tools/arch/x86/include/asm/required-features.h index 7ba1726b71c7..e9187ddd3d1f 100644 --- a/tools/arch/x86/include/asm/required-features.h +++ b/tools/arch/x86/include/asm/required-features.h @@ -99,6 +99,7 @@ #define REQUIRED_MASK18 0 #define REQUIRED_MASK19 0 #define REQUIRED_MASK20 0 -#define REQUIRED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 21) +#define REQUIRED_MASK21 0 +#define REQUIRED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 22) #endif /* _ASM_X86_REQUIRED_FEATURES_H */ |