diff options
| author | David S. Miller <davem@davemloft.net> | 2013-08-27 00:37:08 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-27 00:37:08 +0400 |
| commit | b05930f5d1c7d5873cb050261d21789a99de9d48 (patch) | |
| tree | 2d374846712b0bdacc5dd0a36b3c2f754886e560 /kernel/cpuset.c | |
| parent | b65f63ee845136940db985f3072335d8cdb6fd6c (diff) | |
| parent | 41a00f7950a6bc0aa956f6d6b423f0fbf34d431a (diff) | |
| download | linux-b05930f5d1c7d5873cb050261d21789a99de9d48.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/wireless/iwlwifi/pcie/trans.c
include/linux/inetdevice.h
The inetdevice.h conflict involves moving the IPV4_DEVCONF values
into a UAPI header, overlapping additions of some new entries.
The iwlwifi conflict is a context overlap.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/cpuset.c')
| -rw-r--r-- | kernel/cpuset.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index e5657788fedd..010a0083c0ae 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c @@ -1608,11 +1608,13 @@ static int cpuset_write_u64(struct cgroup *cgrp, struct cftype *cft, u64 val) { struct cpuset *cs = cgroup_cs(cgrp); 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: |