diff --git a/[refs] b/[refs] index 2fe7f097e474..f638bd7334a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ccf831cbee94df9c5006dd46248c0f07847dd7c +refs/heads/master: 59714d65dfbc86d5cb93adc5bac57a921cc2fa84 diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c index 282240afe99e..966c5c5b6741 100644 --- a/trunk/fs/exec.c +++ b/trunk/fs/exec.c @@ -947,12 +947,13 @@ static void flush_old_files(struct files_struct * files) spin_unlock(&files->file_lock); } -void get_task_comm(char *buf, struct task_struct *tsk) +char *get_task_comm(char *buf, struct task_struct *tsk) { /* buf must be at least sizeof(tsk->comm) in size */ task_lock(tsk); strncpy(buf, tsk->comm, sizeof(tsk->comm)); task_unlock(tsk); + return buf; } void set_task_comm(struct task_struct *tsk, char *buf) diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h index af6947e69b40..680bb03a4b90 100644 --- a/trunk/include/linux/sched.h +++ b/trunk/include/linux/sched.h @@ -1770,7 +1770,7 @@ extern long do_fork(unsigned long, unsigned long, struct pt_regs *, unsigned lon struct task_struct *fork_idle(int); extern void set_task_comm(struct task_struct *tsk, char *from); -extern void get_task_comm(char *to, struct task_struct *tsk); +extern char *get_task_comm(char *to, struct task_struct *tsk); #ifdef CONFIG_SMP extern void wait_task_inactive(struct task_struct * p);