projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
cgroup.c
diff --git
a/kernel/cgroup.c
b/kernel/cgroup.c
index 9ef9fc8a774b08820a0dea814ecc4456dd83376c..b89f3168411bc1e9f4f96a42fe5732f3e36c1d41 100644
(file)
--- a/
kernel/cgroup.c
+++ b/
kernel/cgroup.c
@@
-107,8
+107,8
@@
static DEFINE_SPINLOCK(release_agent_path_lock);
struct percpu_rw_semaphore cgroup_threadgroup_rwsem;
#define cgroup_assert_mutex_or_rcu_locked() \
struct percpu_rw_semaphore cgroup_threadgroup_rwsem;
#define cgroup_assert_mutex_or_rcu_locked() \
-
rcu_lockdep_assert(rcu_read_lock_held() ||
\
-
lockdep_is_held(&cgroup_mutex),
\
+
RCU_LOCKDEP_WARN(!rcu_read_lock_held() &&
\
+
!lockdep_is_held(&cgroup_mutex),
\
"cgroup_mutex or RCU read lock required");
/*
"cgroup_mutex or RCU read lock required");
/*
@@
-1939,8
+1939,6
@@
static struct file_system_type cgroup_fs_type = {
.kill_sb = cgroup_kill_sb,
};
.kill_sb = cgroup_kill_sb,
};
-static struct kobject *cgroup_kobj;
-
/**
* task_cgroup_path - cgroup path of a task in the first cgroup hierarchy
* @task: target task
/**
* task_cgroup_path - cgroup path of a task in the first cgroup hierarchy
* @task: target task
@@
-5070,13
+5068,13
@@
int __init cgroup_init(void)
ss->bind(init_css_set.subsys[ssid]);
}
ss->bind(init_css_set.subsys[ssid]);
}
-
cgroup_kobj = kobject_create_and_add("cgroup", fs_kobj
);
- if (
!cgroup_kobj
)
- return
-ENOMEM
;
+
err = sysfs_create_mount_point(fs_kobj, "cgroup"
);
+ if (
err
)
+ return
err
;
err = register_filesystem(&cgroup_fs_type);
if (err < 0) {
err = register_filesystem(&cgroup_fs_type);
if (err < 0) {
-
kobject_put(cgroup_kobj
);
+
sysfs_remove_mount_point(fs_kobj, "cgroup"
);
return err;
}
return err;
}