Skip to content

Commit

Permalink
sh: remove stray markers.
Browse files Browse the repository at this point in the history
arch/sh has a couple of stray markers without any users introduced
in commit 3d58695.  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>
  • Loading branch information
Christoph Hellwig authored and Paul Mundt committed Jun 18, 2009
1 parent b7d3740 commit 4505ffd
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 14 deletions.
2 changes: 0 additions & 2 deletions arch/sh/kernel/process_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,6 @@ int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
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;
}

Expand Down
7 changes: 1 addition & 6 deletions arch/sh/kernel/process_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,6 @@ ATTRIB_NORET void kernel_thread_helper(void *arg, int (*fn)(void *))
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;
Expand All @@ -333,12 +332,8 @@ int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
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;
}

/*
Expand Down
2 changes: 0 additions & 2 deletions arch/sh/kernel/sys_sh.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,6 @@ asmlinkage int sys_ipc(uint call, int first, int second,
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:
Expand Down
4 changes: 0 additions & 4 deletions arch/sh/mm/fault_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,6 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
{
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();
Expand Down Expand Up @@ -327,6 +324,5 @@ asmlinkage int __kprobes __do_page_fault(struct pt_regs *regs,

ret = 0;
out:
trace_mark(kernel_arch_trap_exit, MARK_NOARGS);
return ret;
}

0 comments on commit 4505ffd

Please sign in to comment.