aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/include/asm/trace/exceptions.h4
-rw-r--r--arch/x86/mm/fault.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/include/asm/trace/exceptions.h b/arch/x86/include/asm/trace/exceptions.h
index 86540c094ecc..2fbc66c7885b 100644
--- a/arch/x86/include/asm/trace/exceptions.h
+++ b/arch/x86/include/asm/trace/exceptions.h
@@ -40,8 +40,8 @@ DEFINE_EVENT_FN(x86_exceptions, name, \
40 trace_irq_vector_regfunc, \ 40 trace_irq_vector_regfunc, \
41 trace_irq_vector_unregfunc); 41 trace_irq_vector_unregfunc);
42 42
43DEFINE_PAGE_FAULT_EVENT(user_page_fault); 43DEFINE_PAGE_FAULT_EVENT(page_fault_user);
44DEFINE_PAGE_FAULT_EVENT(kernel_page_fault); 44DEFINE_PAGE_FAULT_EVENT(page_fault_kernel);
45 45
46#undef TRACE_INCLUDE_PATH 46#undef TRACE_INCLUDE_PATH
47#define TRACE_INCLUDE_PATH . 47#define TRACE_INCLUDE_PATH .
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index f2730cbce0b5..e532230685d7 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -1239,9 +1239,9 @@ static void trace_page_fault_entries(struct pt_regs *regs,
1239 unsigned long error_code) 1239 unsigned long error_code)
1240{ 1240{
1241 if (user_mode(regs)) 1241 if (user_mode(regs))
1242 trace_user_page_fault(read_cr2(), regs, error_code); 1242 trace_page_fault_user(read_cr2(), regs, error_code);
1243 else 1243 else
1244 trace_kernel_page_fault(read_cr2(), regs, error_code); 1244 trace_page_fault_kernel(read_cr2(), regs, error_code);
1245} 1245}
1246 1246
1247dotraplinkage void __kprobes 1247dotraplinkage void __kprobes