Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 4505ffda54b352a08eb08ebad62ac48725c41966

Authored by Christoph Hellwig
Committed by Paul Mundt
1 parent b7d3740ace
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 4 changed files with 1 additions and 14 deletions Side-by-side Diff

arch/sh/kernel/process_32.c
Diff comments   View file @ 4505ffd
... ... @@ -119,8 +119,6 @@
119 119 pid = do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0,
120 120 &regs, 0, NULL, NULL);
121 121  
122   - trace_mark(kernel_arch_kthread_create, "pid %d fn %p", pid, fn);
123   -
124 122 return pid;
125 123 }
126 124  
arch/sh/kernel/process_64.c
Diff comments   View file @ 4505ffd
... ... @@ -323,7 +323,6 @@
323 323 int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
324 324 {
325 325 struct pt_regs regs;
326   - int pid;
327 326  
328 327 memset(&regs, 0, sizeof(regs));
329 328 regs.regs[2] = (unsigned long)arg;
330 329  
... ... @@ -333,12 +332,8 @@
333 332 regs.sr = (1 << 30);
334 333  
335 334 /* Ok, create the new process.. */
336   - pid = do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0,
  335 + return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0,
337 336 &regs, 0, NULL, NULL);
338   -
339   - trace_mark(kernel_arch_kthread_create, "pid %d fn %p", pid, fn);
340   -
341   - return pid;
342 337 }
343 338  
344 339 /*
arch/sh/kernel/sys_sh.c
Diff comments   View file @ 4505ffd
... ... @@ -88,8 +88,6 @@
88 88 version = call >> 16; /* hack for backward compatibility */
89 89 call &= 0xffff;
90 90  
91   - trace_mark(kernel_arch_ipc_call, "call %u first %d", call, first);
92   -
93 91 if (call <= SEMTIMEDOP)
94 92 switch (call) {
95 93 case SEMOP:
arch/sh/mm/fault_32.c
Diff comments   View file @ 4505ffd
... ... @@ -249,9 +249,6 @@
249 249 {
250 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 252 #ifdef CONFIG_KPROBES
256 253 if (!user_mode(regs)) {
257 254 preempt_disable();
... ... @@ -327,7 +324,6 @@
327 324  
328 325 ret = 0;
329 326 out:
330   - trace_mark(kernel_arch_trap_exit, MARK_NOARGS);
331 327 return ret;
332 328 }