[PATCH] sh: remove stray markers

[Christoph Hellwig]

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).

Paul, are you okay putting this in via the tracing tree?  I'd like
to have all marker removals queued up there so we can kill it in one
go once 2.6.31 opens.


Signed-off-by: Christoph Hellwig <hch@xxxxxx>

Index: linux-2.6-tip/arch/sh/kernel/process_32.c
===================================================================
--- linux-2.6-tip.orig/arch/sh/kernel/process_32.c	2009-05-06 10:35:22.000000000 +0000
+++ linux-2.6-tip/arch/sh/kernel/process_32.c	2009-05-06 10:35:25.000000000 +0000
@@ -119,8 +119,6 @@
 	pid = do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0,
 		      &regs, 0, NULL, NULL);
 
-	trace_mark(kernel_arch_kthread_create, "pid %d fn %p", pid, fn);
-
 	return pid;
 }
 
Index: linux-2.6-tip/arch/sh/kernel/process_64.c
===================================================================
--- linux-2.6-tip.orig/arch/sh/kernel/process_64.c	2009-05-06 10:35:22.000000000 +0000
+++ linux-2.6-tip/arch/sh/kernel/process_64.c	2009-05-06 10:35:36.000000000 +0000
@@ -323,7 +323,6 @@
 int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
 {
 	struct pt_regs regs;
-	int pid;
 
 	memset(&regs, 0, sizeof(regs));
 	regs.regs[2] = (unsigned long)arg;
@@ -333,12 +332,8 @@
 	regs.sr = (1 << 30);
 
 	/* Ok, create the new process.. */
-	pid = do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0,
+	return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0,
 		      &regs, 0, NULL, NULL);
-
-	trace_mark(kernel_arch_kthread_create, "pid %d fn %p", pid, fn);
-
-	return pid;
 }
 
 /*
Index: linux-2.6-tip/arch/sh/kernel/sys_sh.c
===================================================================
--- linux-2.6-tip.orig/arch/sh/kernel/sys_sh.c	2009-05-06 10:35:22.000000000 +0000
+++ linux-2.6-tip/arch/sh/kernel/sys_sh.c	2009-05-06 10:35:41.000000000 +0000
@@ -79,8 +79,6 @@
 	version = call >> 16; /* hack for backward compatibility */
 	call &= 0xffff;
 
-	trace_mark(kernel_arch_ipc_call, "call %u first %d", call, first);
-
 	if (call <= SEMTIMEDOP)
 		switch (call) {
 		case SEMOP:
Index: linux-2.6-tip/arch/sh/mm/fault_32.c
===================================================================
--- linux-2.6-tip.orig/arch/sh/mm/fault_32.c	2009-05-06 10:35:22.000000000 +0000
+++ linux-2.6-tip/arch/sh/mm/fault_32.c	2009-05-06 10:35:59.000000000 +0000
@@ -249,9 +249,6 @@
 {
 	int ret = 0;
 
-	trace_mark(kernel_arch_trap_entry, "trap_id %d ip #p%ld",
-		   trap >> 5, instruction_pointer(regs));
-
 #ifdef CONFIG_KPROBES
 	if (!user_mode(regs)) {
 		preempt_disable();
@@ -327,6 +324,5 @@
 
 	ret = 0;
 out:
-	trace_mark(kernel_arch_trap_exit, MARK_NOARGS);
 	return ret;
 }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/