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

Commit a4f61dec authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

x86, trace: Change user|kernel_page_fault to page_fault_user|kernel 



Tracepoints are named hierachially, and it makes more sense to keep a
general flow of information level from general to specific from left
to right, i.e.

	x86_exceptions.page_fault_user|kernel

rather than

	x86_exceptions.user|kernel_page_fault

Suggested-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarSeiji Aguchi <seiji.aguchi@hds.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Link: http://lkml.kernel.org/r/20131111082955.GB12405@gmail.com
parent d34603b0

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

+2 −2
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ DEFINE_EVENT_FN(x86_exceptions, name, \ 
	trace_irq_vector_regfunc,				\

	trace_irq_vector_unregfunc);



DEFINE_PAGE_FAULT_EVENT(user_page_fault);

DEFINE_PAGE_FAULT_EVENT(kernel_page_fault);

DEFINE_PAGE_FAULT_EVENT(page_fault_user);

DEFINE_PAGE_FAULT_EVENT(page_fault_kernel);



#undef TRACE_INCLUDE_PATH

#define TRACE_INCLUDE_PATH .

arch/x86/mm/fault.c

+2 −2
Original line number Diff line number Diff line
@@ -1239,9 +1239,9 @@ static void trace_page_fault_entries(struct pt_regs *regs, 
				     unsigned long error_code)

{

	if (user_mode(regs))

		trace_user_page_fault(read_cr2(), regs, error_code);

		trace_page_fault_user(read_cr2(), regs, error_code);

	else

		trace_kernel_page_fault(read_cr2(), regs, error_code);

		trace_page_fault_kernel(read_cr2(), regs, error_code);

}



dotraplinkage void __kprobes