From: H. Peter Anvin Date: Mon, 11 Nov 2013 16:15:40 +0000 (-0800) Subject: x86, trace: Change user|kernel_page_fault to page_fault_user|kernel X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a4f61dec55c1bdebb84ba77212ebf98f7247736c;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git 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: Ingo Molnar Acked-by: Seiji Aguchi Signed-off-by: H. Peter Anvin Link: http://lkml.kernel.org/r/20131111082955.GB12405@gmail.com --- 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, \ 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 . 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, 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