From: Tejun Heo <tj@kernel.org>
Date: Tue, 13 Aug 2013 15:06:06 +0000 (-0400)
Subject: Merge branch 'for-3.11-fixes' into for-next
X-Git-Tag: next-20130822~60^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=78b2324cc10b59562d252f8925e9b0d6842399e6;p=karo-tx-linux.git

Merge branch 'for-3.11-fixes' into for-next
---

78b2324cc10b59562d252f8925e9b0d6842399e6
diff --cc kernel/cpuset.c
index 72a0383f382f,010a0083c0ae..235ad7b3ff1c
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@@ -1594,16 -1604,17 +1594,18 @@@ typedef enum 
  	FILE_SPREAD_SLAB,
  } cpuset_filetype_t;
  
 -static int cpuset_write_u64(struct cgroup *cgrp, struct cftype *cft, u64 val)
 +static int cpuset_write_u64(struct cgroup_subsys_state *css, struct cftype *cft,
 +			    u64 val)
  {
 -	struct cpuset *cs = cgroup_cs(cgrp);
 +	struct cpuset *cs = css_cs(css);
  	cpuset_filetype_t type = cft->private;
- 	int retval = -ENODEV;
+ 	int retval = 0;
  
  	mutex_lock(&cpuset_mutex);
- 	if (!is_cpuset_online(cs))
+ 	if (!is_cpuset_online(cs)) {
+ 		retval = -ENODEV;
  		goto out_unlock;
+ 	}
  
  	switch (type) {
  	case FILE_CPU_EXCLUSIVE: