From: Linus Torvalds Date: Tue, 27 May 2025 04:18:59 +0000 (-0700) Subject: Merge tag 'x86-debug-2025-05-25' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v6.16-rc1~193 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0aee0617267866555b4e35bd11e1fbb291fa9743;p=thirdparty%2Fkernel%2Flinux.git Merge tag 'x86-debug-2025-05-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull x86 debug updates from Ingo Molnar: "Move the x86 page fault tracepoints to generic code, because other architectures would like to make use of them as well" * tag 'x86-debug-2025-05-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/tracing, x86/mm: Move page fault tracepoints to generic x86/tracing, x86/mm: Remove redundant trace_pagefault_key --- 0aee0617267866555b4e35bd11e1fbb291fa9743 diff --cc arch/x86/mm/Makefile index cebe5812d78db,629a8bf122195..5b9908f13dcfd --- a/arch/x86/mm/Makefile +++ b/arch/x86/mm/Makefile @@@ -28,9 -32,8 +28,7 @@@ obj-y += pat # Make sure __phys_addr has no stackprotector CFLAGS_physaddr.o := -fno-stack-protector -CFLAGS_mem_encrypt_identity.o := -fno-stack-protector - CFLAGS_fault.o := -I $(src)/../include/asm/trace - obj-$(CONFIG_X86_32) += pgtable_32.o iomap_32.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o