diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-12-12 10:26:43 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-12-12 10:26:43 +0100 |
| commit | ee1a2c4ff410b060fc3def816a1e9f933b1519c2 (patch) | |
| tree | ae42bb21cc7ac946f4fd9cbc812360ea1105d375 /include/trace/events | |
| parent | 899c86a50aa623fe6bf78127357f455bcd5e736e (diff) | |
| parent | 581a8b7b1e1e2ac53d6c150e4b592ae69aeea2e4 (diff) | |
| download | tip-master.tar.gz | |
Merge branch into tip/master: 'x86/urgent'HEADtip/urgentmaster
# New commits in x86/urgent:
581a8b7b1e1e ("mm: Remove tlb_flush_reason::NR_TLB_FLUSH_REASONS from <linux/mm_types.h>")
2d130eeeaff6 ("x86/mm/tlb/trace: Export the TLB_REMOTE_WRONG_CPU enum in <trace/events/tlb.h>")
d63bc9210ba0 ("x86/sgx: Remove unmatched quote in __sgx_encl_extend function comment")
4368a3b96c42 ("x86/acpi/boot: Correct acpi_is_processor_usable() check again")
ac87efcf9e42 ("x86/boot/Documentation: Fix whitespace noise in boot.rst")
c8161e5304ab ("x86/fpu: Fix FPU state core dump truncation on CPUs with no extended xfeatures")
5288176a5412 ("x86/boot/Documentation: Fix htmldocs build warning due to malformed table in boot.rst")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/trace/events')
| -rw-r--r-- | include/trace/events/tlb.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/trace/events/tlb.h b/include/trace/events/tlb.h index b4d8e7dc38f880..fb836951168564 100644 --- a/include/trace/events/tlb.h +++ b/include/trace/events/tlb.h @@ -12,8 +12,9 @@ EM( TLB_FLUSH_ON_TASK_SWITCH, "flush on task switch" ) \ EM( TLB_REMOTE_SHOOTDOWN, "remote shootdown" ) \ EM( TLB_LOCAL_SHOOTDOWN, "local shootdown" ) \ - EM( TLB_LOCAL_MM_SHOOTDOWN, "local mm shootdown" ) \ - EMe( TLB_REMOTE_SEND_IPI, "remote ipi send" ) + EM( TLB_LOCAL_MM_SHOOTDOWN, "local MM shootdown" ) \ + EM( TLB_REMOTE_SEND_IPI, "remote IPI send" ) \ + EMe( TLB_REMOTE_WRONG_CPU, "remote wrong CPU" ) /* * First define the enums in TLB_FLUSH_REASON to be exported to userspace |