History

block: fix a build error

The code is only for blkcg not for all cgroups

Shaohua Li committed 9 years ago

Commit 0b508bc1 parent 9979d543 files · +6 −6Browse files

Showing the changes to kernel/kthread.c (1 of 3 files). Show all

Unified · Split

kernel/kthread.c+4−4
@@ -46,7 +46,7 @@ struct kthread { · 45 unmodified lines
4646 void *data;
4747 struct completion parked;
4848 struct completion exited;
49−#ifdef CONFIG_CGROUPS
49+#ifdef CONFIG_BLK_CGROUP
5050 struct cgroup_subsys_state *blkcg_css;
5151 #endif
5252 };
@@ -83,7 +83,7 @@ void free_kthread_struct(struct task_struct *k) · 30 unmodified lines
8383 * or if kmalloc() in kthread() failed.
8484 */
8585 kthread = to_kthread(k);
86−#ifdef CONFIG_CGROUPS
86+#ifdef CONFIG_BLK_CGROUP
8787 WARN_ON_ONCE(kthread && kthread->blkcg_css);
8888 #endif
8989 kfree(kthread);
@@ -224,7 +224,7 @@ static int kthread(void *_create) · 134 unmodified lines
224224 self->data = data;
225225 init_completion(&self->exited);
226226 init_completion(&self->parked);
227−#ifdef CONFIG_CGROUPS
227+#ifdef CONFIG_BLK_CGROUP
228228 self->blkcg_css = NULL;
229229 #endif
230230 current->vfork_done = &self->exited;
@@ -1166,7 +1166,7 @@ void kthread_destroy_worker(struct kthread_worker *worker) · 935 unmodified lines
11661166 }
11671167 EXPORT_SYMBOL(kthread_destroy_worker);
11681168
1169−#ifdef CONFIG_CGROUPS
1169+#ifdef CONFIG_BLK_CGROUP
11701170 /**
11711171 * kthread_associate_blkcg - associate blkcg to current kthread
11721172 * @css: the cgroup info

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t