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

Commit fd3fdf11 authored by Pekka Paalanen's avatar Pekka Paalanen Committed by Ingo Molnar
Browse files

trace: add the MMIO-tracer to the tracer menu, cleanup 



Impact: cleanup

We can remove MMIOTRACE_HOOKS and replace it with just MMIOTRACE.
MMIOTRACE_HOOKS is a remnant from the time when I thought that
something else could also use the kmmio facilities.

Signed-off-by: default avatarPekka Paalanen <pq@iki.fi>
Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f8d56f17

arch/x86/Kconfig.debug

+0 −4
Original line number Diff line number Diff line
@@ -186,14 +186,10 @@ config IOMMU_LEAK 
	  Add a simple leak tracer to the IOMMU code. This is useful when you

	  are debugging a buggy device driver that leaks IOMMU mappings.



config MMIOTRACE_HOOKS

	bool



config MMIOTRACE

	bool "Memory mapped IO tracing"

	depends on DEBUG_KERNEL && PCI

	select TRACING

	select MMIOTRACE_HOOKS

	help

	  Mmiotrace traces Memory Mapped I/O access and is meant for

	  debugging and reverse engineering. It is called from the ioremap

arch/x86/mm/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -8,9 +8,8 @@ obj-$(CONFIG_X86_PTDUMP) += dump_pagetables.o 


obj-$(CONFIG_HIGHMEM)		+= highmem_32.o



obj-$(CONFIG_MMIOTRACE_HOOKS)	+= kmmio.o

obj-$(CONFIG_MMIOTRACE)		+= mmiotrace.o

mmiotrace-y			:= pf_in.o mmio-mod.o

mmiotrace-y			:= kmmio.o pf_in.o mmio-mod.o

obj-$(CONFIG_MMIOTRACE_TEST)	+= testmmiotrace.o



obj-$(CONFIG_NUMA)		+= numa_$(BITS).o

arch/x86/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 


static inline int kmmio_fault(struct pt_regs *regs, unsigned long addr)

{

#ifdef CONFIG_MMIOTRACE_HOOKS

#ifdef CONFIG_MMIOTRACE

	if (unlikely(is_kmmio_active()))

		if (kmmio_handler(regs, addr) == 1)

			return -1;