summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig10
-rw-r--r--init/main.c5
2 files changed, 15 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 97789f2c3111..ac693aac85d5 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -237,6 +237,16 @@ config IKCONFIG_PROC
This option enables access to the kernel configuration file
through /proc/config.gz.
+config CPUSETS
+ bool "Cpuset support"
+ depends on SMP
+ help
+ This options will let you create and manage CPUSET's which
+ allow dynamically partitioning a system into sets of CPUs and
+ Memory Nodes and assigning tasks to run only within those sets.
+ This is primarily useful on large SMP or NUMA systems.
+
+ Say N if unsure.
menuconfig EMBEDDED
bool "Configure standard kernel features (for small systems)"
diff --git a/init/main.c b/init/main.c
index 678a332d308a..0cd4d6137d49 100644
--- a/init/main.c
+++ b/init/main.c
@@ -41,6 +41,7 @@
#include <linux/kallsyms.h>
#include <linux/writeback.h>
#include <linux/cpu.h>
+#include <linux/cpuset.h>
#include <linux/efi.h>
#include <linux/unistd.h>
#include <linux/rmap.h>
@@ -515,6 +516,8 @@ asmlinkage void __init start_kernel(void)
#ifdef CONFIG_PROC_FS
proc_root_init();
#endif
+ cpuset_init();
+
check_bugs();
acpi_early_init(); /* before LAPIC and SMP init */
@@ -656,6 +659,8 @@ static int init(void * unused)
smp_init();
sched_init_smp();
+ cpuset_init_smp();
+
/*
* Do this before initcalls, because some drivers want to access
* firmware files.