diff options
Diffstat (limited to 'kernel/kthread.c')
-rw-r--r-- | kernel/kthread.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/kthread.c b/kernel/kthread.c index b011ea08967f..f87cd8b4eb2a 100644 --- a/kernel/kthread.c +++ b/kernel/kthread.c | |||
@@ -46,7 +46,7 @@ struct kthread { | |||
46 | void *data; | 46 | void *data; |
47 | struct completion parked; | 47 | struct completion parked; |
48 | struct completion exited; | 48 | struct completion exited; |
49 | #ifdef CONFIG_CGROUPS | 49 | #ifdef CONFIG_BLK_CGROUP |
50 | struct cgroup_subsys_state *blkcg_css; | 50 | struct cgroup_subsys_state *blkcg_css; |
51 | #endif | 51 | #endif |
52 | }; | 52 | }; |
@@ -83,7 +83,7 @@ void free_kthread_struct(struct task_struct *k) | |||
83 | * or if kmalloc() in kthread() failed. | 83 | * or if kmalloc() in kthread() failed. |
84 | */ | 84 | */ |
85 | kthread = to_kthread(k); | 85 | kthread = to_kthread(k); |
86 | #ifdef CONFIG_CGROUPS | 86 | #ifdef CONFIG_BLK_CGROUP |
87 | WARN_ON_ONCE(kthread && kthread->blkcg_css); | 87 | WARN_ON_ONCE(kthread && kthread->blkcg_css); |
88 | #endif | 88 | #endif |
89 | kfree(kthread); | 89 | kfree(kthread); |
@@ -224,7 +224,7 @@ static int kthread(void *_create) | |||
224 | self->data = data; | 224 | self->data = data; |
225 | init_completion(&self->exited); | 225 | init_completion(&self->exited); |
226 | init_completion(&self->parked); | 226 | init_completion(&self->parked); |
227 | #ifdef CONFIG_CGROUPS | 227 | #ifdef CONFIG_BLK_CGROUP |
228 | self->blkcg_css = NULL; | 228 | self->blkcg_css = NULL; |
229 | #endif | 229 | #endif |
230 | current->vfork_done = &self->exited; | 230 | current->vfork_done = &self->exited; |
@@ -1166,7 +1166,7 @@ void kthread_destroy_worker(struct kthread_worker *worker) | |||
1166 | } | 1166 | } |
1167 | EXPORT_SYMBOL(kthread_destroy_worker); | 1167 | EXPORT_SYMBOL(kthread_destroy_worker); |
1168 | 1168 | ||
1169 | #ifdef CONFIG_CGROUPS | 1169 | #ifdef CONFIG_BLK_CGROUP |
1170 | /** | 1170 | /** |
1171 | * kthread_associate_blkcg - associate blkcg to current kthread | 1171 | * kthread_associate_blkcg - associate blkcg to current kthread |
1172 | * @css: the cgroup info | 1172 | * @css: the cgroup info |