tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

Pull cgroup fix from Tejun Heo:
"This contains one patch to fix the return value of cpuset's cgroups
interface function, which used to always return -ENODEV for the writes
on the 'memory_pressure_enabled' file"

* 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cpuset: fix the return value of cpuset_write_u64()

Linus Torvalds 50e37cce a08797e8

+4 -2
+4 -2
kernel/cpuset.c
··· 1608 1608 { 1609 1609 struct cpuset *cs = cgroup_cs(cgrp); 1610 1610 cpuset_filetype_t type = cft->private; 1611 - int retval = -ENODEV; 1611 + int retval = 0; 1612 1612 1613 1613 mutex_lock(&cpuset_mutex); 1614 - if (!is_cpuset_online(cs)) 1614 + if (!is_cpuset_online(cs)) { 1615 + retval = -ENODEV; 1615 1616 goto out_unlock; 1617 + } 1616 1618 1617 1619 switch (type) { 1618 1620 case FILE_CPU_EXCLUSIVE: