Messages in this thread Patch in this message |  | | | Date | Mon, 6 Nov 2006 12:55:53 -0800 | | From | "Paul Menage" <> | | Subject | Re: [ckrm-tech] [PATCH 2/6] Cpusets hooked into containers |
| |
On 11/5/06, Balbir Singh <balbir@in.ibm.com> wrote: > > I needed the following patches to get the cpuset code to compile. > Inlining two patches makes it hard to distinguish between the patches > and harder to read them, so I am attaching them along with this email.
The first I missed due to not compiling with CONFIG_HOTPLUG_* - thanks for the patch.
For the second, the following change to fs/proc/base.c should have appeared in cpusets_using_containers.patch, but got left out due to quilt misusage. It basically makes "cpuset" an alias for "container" in the relevant /proc directories if CONFIG_CPUSETS_LEGACY_API is defined.
--- container-2.6.19-rc2.orig/fs/proc/base.c +++ container-2.6.19-rc2/fs/proc/base.c @@ -69,7 +69,6 @@ #include <linux/ptrace.h> #include <linux/seccomp.h> #include <linux/container.h> -#include <linux/cpuset.h> #include <linux/audit.h> #include <linux/poll.h> #include <linux/nsproxy.h> @@ -1784,8 +1783,8 @@ static struct pid_entry tgid_base_stuff[ #ifdef CONFIG_CONTAINERS REG("container", S_IRUGO, container), #endif -#ifdef CONFIG_CPUSETS - REG("cpuset", S_IRUGO, cpuset), +#ifdef CONFIG_CPUSETS_LEGACY_API + REG("cpuset", S_IRUGO, container), #endif INF("oom_score", S_IRUGO, oom_score), REG("oom_adj", S_IRUGO|S_IWUSR, oom_adjust), @@ -2061,8 +2060,8 @@ static struct pid_entry tid_base_stuff[] #ifdef CONFIG_CONTAINERS REG("container", S_IRUGO, container), #endif -#ifdef CONFIG_CPUSETS - REG("cpuset", S_IRUGO, cpuset), +#ifdef CONFIG_CPUSETS_LEGACY_API + REG("cpuset", S_IRUGO, container), #endif INF("oom_score", S_IRUGO, oom_score), REG("oom_adj", S_IRUGO|S_IWUSR, oom_adjust), Paul - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
|  |