Merge branch 'master' into next

[paraslash.git] / afs.c

diff --git a/afs.c b/afs.c
index 2ebc0089cdeb15dda9dbd7bd0e0cc7d592c7d824..72e2490e671fb4b5898bddea96cc922a1c435c25 100644 (file)
--- a/afs.c
+++ b/afs.c
@@ -776,7 +776,7 @@ static void signal_pre_select(struct sched *s, struct task *t)
        para_fd_set(st->fd, &s->rfds, &s->max_fileno);
 }
 
-static void signal_post_select(struct sched *s, struct task *t)
+static void afs_signal_post_select(struct sched *s, struct task *t)
 {
        struct signal_task *st = container_of(t, struct signal_task, task);
        if (getppid() == 1) {
@@ -813,7 +813,7 @@ static void register_signal_task(void)
        para_install_sighandler(SIGHUP);
 
        st->task.pre_select = signal_pre_select;
-       st->task.post_select = signal_post_select;
+       st->task.post_select = afs_signal_post_select;
        sprintf(st->task.status, "signal task");
        register_task(&st->task);
 }