diff --git a/[refs] b/[refs] index 2dac6a765eac..b19aa9ba1543 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b4217b3fdddc4a58939720d3ed809537577d48b +refs/heads/master: bd1a8ab73edd449fecda633449cc277b856ad4f5 diff --git a/trunk/include/linux/cgroup.h b/trunk/include/linux/cgroup.h index 43763bd772b9..4316a546beb5 100644 --- a/trunk/include/linux/cgroup.h +++ b/trunk/include/linux/cgroup.h @@ -337,6 +337,7 @@ struct cgroup_scanner { void (*process_task)(struct task_struct *p, struct cgroup_scanner *scan); struct ptr_heap *heap; + void *data; }; /*