diff options
Diffstat (limited to 'include/linux/kthread.h')
| -rw-r--r-- | include/linux/kthread.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/kthread.h b/include/linux/kthread.h index 4e26609c77d4..86d53a3cb497 100644 --- a/include/linux/kthread.h +++ b/include/linux/kthread.h | |||
| @@ -76,7 +76,7 @@ extern int tsk_fork_get_node(struct task_struct *tsk); | |||
| 76 | */ | 76 | */ |
| 77 | struct kthread_work; | 77 | struct kthread_work; |
| 78 | typedef void (*kthread_work_func_t)(struct kthread_work *work); | 78 | typedef void (*kthread_work_func_t)(struct kthread_work *work); |
| 79 | void kthread_delayed_work_timer_fn(unsigned long __data); | 79 | void kthread_delayed_work_timer_fn(struct timer_list *t); |
| 80 | 80 | ||
| 81 | enum { | 81 | enum { |
| 82 | KTW_FREEZABLE = 1 << 0, /* freeze during suspend */ | 82 | KTW_FREEZABLE = 1 << 0, /* freeze during suspend */ |
| @@ -117,8 +117,8 @@ struct kthread_delayed_work { | |||
| 117 | 117 | ||
| 118 | #define KTHREAD_DELAYED_WORK_INIT(dwork, fn) { \ | 118 | #define KTHREAD_DELAYED_WORK_INIT(dwork, fn) { \ |
| 119 | .work = KTHREAD_WORK_INIT((dwork).work, (fn)), \ | 119 | .work = KTHREAD_WORK_INIT((dwork).work, (fn)), \ |
| 120 | .timer = __TIMER_INITIALIZER(kthread_delayed_work_timer_fn, \ | 120 | .timer = __TIMER_INITIALIZER((TIMER_FUNC_TYPE)kthread_delayed_work_timer_fn,\ |
| 121 | 0, (unsigned long)&(dwork), \ | 121 | (TIMER_DATA_TYPE)&(dwork.timer), \ |
| 122 | TIMER_IRQSAFE), \ | 122 | TIMER_IRQSAFE), \ |
| 123 | } | 123 | } |
| 124 | 124 | ||
| @@ -165,8 +165,8 @@ extern void __kthread_init_worker(struct kthread_worker *worker, | |||
| 165 | do { \ | 165 | do { \ |
| 166 | kthread_init_work(&(dwork)->work, (fn)); \ | 166 | kthread_init_work(&(dwork)->work, (fn)); \ |
| 167 | __setup_timer(&(dwork)->timer, \ | 167 | __setup_timer(&(dwork)->timer, \ |
| 168 | kthread_delayed_work_timer_fn, \ | 168 | (TIMER_FUNC_TYPE)kthread_delayed_work_timer_fn,\ |
| 169 | (unsigned long)(dwork), \ | 169 | (TIMER_DATA_TYPE)&(dwork)->timer, \ |
| 170 | TIMER_IRQSAFE); \ | 170 | TIMER_IRQSAFE); \ |
| 171 | } while (0) | 171 | } while (0) |
| 172 | 172 | ||
