aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/mm
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2009-06-18 00:38:26 -0400
committerPaul Mundt <lethal@linux-sh.org>2009-06-18 00:38:26 -0400
commit4505ffda54b352a08eb08ebad62ac48725c41966 (patch)
tree74a8ac824840038dad7d10a6ab24b0f7864714e7 /arch/sh/mm
parentb7d3740ace895b85e802c618b2edfed1bba67d9e (diff)
sh: remove stray markers.
arch/sh has a couple of stray markers without any users introduced in commit 3d58695edbfac785161bf282dc11fd42a483d6c9. Remove them in preparation of removing the markers in favour of the TRACE_EVENT macro (and also because we don't keep dead code around). Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/mm')
-rw-r--r--arch/sh/mm/fault_32.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/sh/mm/fault_32.c b/arch/sh/mm/fault_32.c
index 31a33ebdef6f..2c50f80fc332 100644
--- a/arch/sh/mm/fault_32.c
+++ b/arch/sh/mm/fault_32.c
@@ -249,9 +249,6 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
249{ 249{
250 int ret = 0; 250 int ret = 0;
251 251
252 trace_mark(kernel_arch_trap_entry, "trap_id %d ip #p%ld",
253 trap >> 5, instruction_pointer(regs));
254
255#ifdef CONFIG_KPROBES 252#ifdef CONFIG_KPROBES
256 if (!user_mode(regs)) { 253 if (!user_mode(regs)) {
257 preempt_disable(); 254 preempt_disable();
@@ -327,6 +324,5 @@ asmlinkage int __kprobes __do_page_fault(struct pt_regs *regs,
327 324
328 ret = 0; 325 ret = 0;
329out: 326out:
330 trace_mark(kernel_arch_trap_exit, MARK_NOARGS);
331 return ret; 327 return ret;
332} 328}