mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-18 10:56:14 +00:00
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: Pekka Paalanen <pq@iki.fi> Acked-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
f8d56f1771
commit
fd3fdf11d3
@ -186,14 +186,10 @@ config IOMMU_LEAK
|
|||||||
Add a simple leak tracer to the IOMMU code. This is useful when you
|
Add a simple leak tracer to the IOMMU code. This is useful when you
|
||||||
are debugging a buggy device driver that leaks IOMMU mappings.
|
are debugging a buggy device driver that leaks IOMMU mappings.
|
||||||
|
|
||||||
config MMIOTRACE_HOOKS
|
|
||||||
bool
|
|
||||||
|
|
||||||
config MMIOTRACE
|
config MMIOTRACE
|
||||||
bool "Memory mapped IO tracing"
|
bool "Memory mapped IO tracing"
|
||||||
depends on DEBUG_KERNEL && PCI
|
depends on DEBUG_KERNEL && PCI
|
||||||
select TRACING
|
select TRACING
|
||||||
select MMIOTRACE_HOOKS
|
|
||||||
help
|
help
|
||||||
Mmiotrace traces Memory Mapped I/O access and is meant for
|
Mmiotrace traces Memory Mapped I/O access and is meant for
|
||||||
debugging and reverse engineering. It is called from the ioremap
|
debugging and reverse engineering. It is called from the ioremap
|
||||||
|
@ -8,9 +8,8 @@ obj-$(CONFIG_X86_PTDUMP) += dump_pagetables.o
|
|||||||
|
|
||||||
obj-$(CONFIG_HIGHMEM) += highmem_32.o
|
obj-$(CONFIG_HIGHMEM) += highmem_32.o
|
||||||
|
|
||||||
obj-$(CONFIG_MMIOTRACE_HOOKS) += kmmio.o
|
|
||||||
obj-$(CONFIG_MMIOTRACE) += mmiotrace.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_MMIOTRACE_TEST) += testmmiotrace.o
|
||||||
|
|
||||||
obj-$(CONFIG_NUMA) += numa_$(BITS).o
|
obj-$(CONFIG_NUMA) += numa_$(BITS).o
|
||||||
|
@ -53,7 +53,7 @@
|
|||||||
|
|
||||||
static inline int kmmio_fault(struct pt_regs *regs, unsigned long addr)
|
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 (unlikely(is_kmmio_active()))
|
||||||
if (kmmio_handler(regs, addr) == 1)
|
if (kmmio_handler(regs, addr) == 1)
|
||||||
return -1;
|
return -1;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user