Skip to content

Commit

Permalink
c6x: switch to generic kernel_thread()
Browse files Browse the repository at this point in the history
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Oct 1, 2012
1 parent 680a145 commit 5687580
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 21 deletions.
1 change: 1 addition & 0 deletions arch/c6x/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ config C6X
select OF
select OF_EARLY_FLATTREE
select GENERIC_CLOCKEVENTS
select GENERIC_KERNEL_THREAD

config MMU
def_bool n
Expand Down
2 changes: 0 additions & 2 deletions arch/c6x/include/asm/processor.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,6 @@ static inline void release_thread(struct task_struct *dead_task)
{
}

extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);

#define copy_segments(tsk, mm) do { } while (0)
#define release_segments(mm) do { } while (0)

Expand Down
24 changes: 5 additions & 19 deletions arch/c6x/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -104,22 +104,6 @@ void machine_power_off(void)
halt_loop();
}

/*
* Create a kernel thread
*/
int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
{
struct pt_regs regs = {
.a0 = (unsigned long)fn,
.a1 = (unsigned long)arg,
.tsr = 0, /* kernel mode */
};

/* Ok, create the new process.. */
return do_fork(flags | CLONE_VM | CLONE_UNTRACED, -1, &regs,
0, NULL, NULL);
}

void flush_thread(void)
{
}
Expand Down Expand Up @@ -177,14 +161,16 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,

childregs = task_pt_regs(p);

*childregs = *regs;

if (usp == -1) {
if (!regs) {
/* case of __kernel_thread: we return to supervisor space */
memset(childregs, 0, sizeof(struct pt_regs));
childregs->sp = (unsigned long)(childregs + 1);
p->thread.pc = (unsigned long) ret_from_kernel_thread;
childregs->a0 = usp; /* function */
childregs->a1 = ustk_size; /* argument */
} else {
/* Otherwise use the given stack */
*childregs = *regs;
childregs->sp = usp;
p->thread.pc = (unsigned long) ret_from_fork;
}
Expand Down

0 comments on commit 5687580

Please sign in to comment.