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

Commit 163b2f0b authored by Paul Mundt's avatar Paul Mundt
Browse files

sh64: Hook up page fault events for software perf counters. 



sh64 can use these as well, so tie them up there as well.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 7433ab77

arch/sh/mm/tlbflush_64.c

+12 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * Copyright (C) 2000, 2001  Paolo Alberelli

 * Copyright (C) 2003  Richard Curnow (/proc/tlb, bug fixes)

 * Copyright (C) 2003  Paul Mundt

 * Copyright (C) 2003 - 2009 Paul Mundt

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive
@@ -20,6 +20,7 @@ 
#include <linux/mman.h>

#include <linux/mm.h>

#include <linux/smp.h>

#include <linux/perf_counter.h>

#include <linux/interrupt.h>

#include <asm/system.h>

#include <asm/io.h>
@@ -115,6 +116,8 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess, 
	/* Not an IO address, so reenable interrupts */

	local_irq_enable();



	perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS, 1, 0, regs, address);



	/*

	 * If we're in an interrupt or have no user

	 * context, we must not take the fault..
@@ -195,10 +198,16 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess, 
			goto do_sigbus;

		BUG();

	}

	if (fault & VM_FAULT_MAJOR)



	if (fault & VM_FAULT_MAJOR) {

		tsk->maj_flt++;

	else

		perf_swcounter_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,

				     regs, address);

	}



	/* If we get here, the page fault has been handled.  Do the TLB refill

	   now from the newly-setup PTE, to avoid having to fault again right