diff options
Diffstat (limited to 'arch/x86/mm/fault.c')
| -rw-r--r-- | arch/x86/mm/fault.c | 8 | 
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 775a020990a..82728f2c6d5 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -10,7 +10,7 @@  #include <linux/bootmem.h>		/* max_low_pfn			*/  #include <linux/kprobes.h>		/* __kprobes, ...		*/  #include <linux/mmiotrace.h>		/* kmmio_handler, ...		*/ -#include <linux/perf_counter.h>		/* perf_swcounter_event		*/ +#include <linux/perf_event.h>		/* perf_sw_event		*/  #include <asm/traps.h>			/* dotraplinkage, ...		*/  #include <asm/pgalloc.h>		/* pgd_*(), ...			*/ @@ -1017,7 +1017,7 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)  	if (unlikely(error_code & PF_RSVD))  		pgtable_bad(regs, error_code, address); -	perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS, 1, 0, regs, address); +	perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, 0, regs, address);  	/*  	 * If we're in an interrupt, have no user context or are running @@ -1114,11 +1114,11 @@ good_area:  	if (fault & VM_FAULT_MAJOR) {  		tsk->maj_flt++; -		perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, 0, +		perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, 0,  				     regs, address);  	} else {  		tsk->min_flt++; -		perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, 0, +		perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, 0,  				     regs, address);  	}  |