summaryrefslogtreecommitdiff
path: root/arch/arm/mm
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2007-12-03 15:27:56 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-01-26 15:25:17 +0000
commit785d3cd286f0bf67d1bf692559b9ae5de12678f5 (patch)
treed533f0ab4792b1df11a0f862ec7246bb4455869c /arch/arm/mm
parentd30a0c8bf99f0e6a7d8c57bd4524039585ffbced (diff)
downloadlinux-3.10-785d3cd286f0bf67d1bf692559b9ae5de12678f5.tar.gz
linux-3.10-785d3cd286f0bf67d1bf692559b9ae5de12678f5.tar.bz2
linux-3.10-785d3cd286f0bf67d1bf692559b9ae5de12678f5.zip
ARM kprobes: prevent some functions involved with kprobes from being probed
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Diffstat (limited to 'arch/arm/mm')
-rw-r--r--arch/arm/mm/fault.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index 1e7b1ed304d..28ad7ab1c0c 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -239,7 +239,7 @@ out:
return fault;
}
-static int
+static int __kprobes
do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
{
struct task_struct *tsk;
@@ -338,7 +338,7 @@ no_context:
* interrupt or a critical region, and should only copy the information
* from the master page table, nothing more.
*/
-static int
+static int __kprobes
do_translation_fault(unsigned long addr, unsigned int fsr,
struct pt_regs *regs)
{