Commit 0aee0617 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 020fca04 06aa9378

arch/x86/include/asm/trace/common.h

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
#ifndef _ASM_TRACE_COMMON_H

#define _ASM_TRACE_COMMON_H



#ifdef CONFIG_TRACING

DECLARE_STATIC_KEY_FALSE(trace_pagefault_key);

#define trace_pagefault_enabled()			\

	static_branch_unlikely(&trace_pagefault_key)

#else

static inline bool trace_pagefault_enabled(void) { return false; }

#endif



#endif

arch/x86/include/asm/trace/irq_vectors.h

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
#define _TRACE_IRQ_VECTORS_H



#include <linux/tracepoint.h>

#include <asm/trace/common.h>



#ifdef CONFIG_X86_LOCAL_APIC

arch/x86/kernel/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ obj-$(CONFIG_OF) += devicetree.o 
obj-$(CONFIG_UPROBES)			+= uprobes.o



obj-$(CONFIG_PERF_EVENTS)		+= perf_regs.o

obj-$(CONFIG_TRACING)			+= tracepoint.o

obj-$(CONFIG_SCHED_MC_PRIO)		+= itmt.o

obj-$(CONFIG_X86_UMIP)			+= umip.o

arch/x86/kernel/tracepoint.c

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (C) 2013 Seiji Aguchi <seiji.aguchi@hds.com>

 */

#include <linux/jump_label.h>

#include <linux/atomic.h>



#include <asm/trace/exceptions.h>



DEFINE_STATIC_KEY_FALSE(trace_pagefault_key);



int trace_pagefault_reg(void)

{

	static_branch_inc(&trace_pagefault_key);

	return 0;

}



void trace_pagefault_unreg(void)

{

	static_branch_dec(&trace_pagefault_key);

}

arch/x86/mm/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ obj-y += pat/ 
# Make sure __phys_addr has no stackprotector

CFLAGS_physaddr.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