From 3ce2fea233d3778af4dff0c16ca31f15a20003e3 Mon Sep 17 00:00:00 2001 From: Li Zefan Date: Wed, 29 Oct 2008 14:00:54 -0700 Subject: [PATCH] --- yaml --- r: 118027 b: refs/heads/master c: 9b913735e53ab0da4a792bac0de8e178cc13dcfb h: refs/heads/master i: 118025: b213338ac9efc097d4185c62fddde5a8a5e5f501 118023: e02d66d1e4f332594196112a3cd0fa6f4be50330 v: v3 --- [refs] | 2 +- trunk/include/linux/cgroup.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0a66c54bb0bf..8c958526b10f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51308ee59dee1136ed599d875ea8968d7be55c91 +refs/heads/master: 9b913735e53ab0da4a792bac0de8e178cc13dcfb diff --git a/trunk/include/linux/cgroup.h b/trunk/include/linux/cgroup.h index 8b00f6643e93..1164963c3a85 100644 --- a/trunk/include/linux/cgroup.h +++ b/trunk/include/linux/cgroup.h @@ -25,7 +25,6 @@ struct cgroup; extern int cgroup_init_early(void); extern int cgroup_init(void); -extern void cgroup_init_smp(void); extern void cgroup_lock(void); extern bool cgroup_lock_live_group(struct cgroup *cgrp); extern void cgroup_unlock(void); @@ -348,8 +347,6 @@ struct cgroup_subsys { struct cgroupfs_root *root; struct list_head sibling; - - void *private; }; #define SUBSYS(_x) extern struct cgroup_subsys _x ## _subsys; @@ -410,7 +407,6 @@ void cgroup_mm_owner_callbacks(struct task_struct *old, static inline int cgroup_init_early(void) { return 0; } static inline int cgroup_init(void) { return 0; } -static inline void cgroup_init_smp(void) {} static inline void cgroup_fork(struct task_struct *p) {} static inline void cgroup_fork_callbacks(struct task_struct *p) {} static inline void cgroup_post_fork(struct task_struct *p) {}