diff options
Diffstat (limited to 'init/Kconfig')
-rw-r--r-- | init/Kconfig | 259 |
1 files changed, 132 insertions, 127 deletions
diff --git a/init/Kconfig b/init/Kconfig index a3e3bf548046..95a66131403a 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -298,6 +298,98 @@ config AUDIT_TREE | |||
298 | def_bool y | 298 | def_bool y |
299 | depends on AUDITSYSCALL && INOTIFY | 299 | depends on AUDITSYSCALL && INOTIFY |
300 | 300 | ||
301 | menu "RCU Subsystem" | ||
302 | |||
303 | choice | ||
304 | prompt "RCU Implementation" | ||
305 | default CLASSIC_RCU | ||
306 | |||
307 | config CLASSIC_RCU | ||
308 | bool "Classic RCU" | ||
309 | help | ||
310 | This option selects the classic RCU implementation that is | ||
311 | designed for best read-side performance on non-realtime | ||
312 | systems. | ||
313 | |||
314 | Select this option if you are unsure. | ||
315 | |||
316 | config TREE_RCU | ||
317 | bool "Tree-based hierarchical RCU" | ||
318 | help | ||
319 | This option selects the RCU implementation that is | ||
320 | designed for very large SMP system with hundreds or | ||
321 | thousands of CPUs. | ||
322 | |||
323 | config PREEMPT_RCU | ||
324 | bool "Preemptible RCU" | ||
325 | depends on PREEMPT | ||
326 | help | ||
327 | This option reduces the latency of the kernel by making certain | ||
328 | RCU sections preemptible. Normally RCU code is non-preemptible, if | ||
329 | this option is selected then read-only RCU sections become | ||
330 | preemptible. This helps latency, but may expose bugs due to | ||
331 | now-naive assumptions about each RCU read-side critical section | ||
332 | remaining on a given CPU through its execution. | ||
333 | |||
334 | endchoice | ||
335 | |||
336 | config RCU_TRACE | ||
337 | bool "Enable tracing for RCU" | ||
338 | depends on TREE_RCU || PREEMPT_RCU | ||
339 | help | ||
340 | This option provides tracing in RCU which presents stats | ||
341 | in debugfs for debugging RCU implementation. | ||
342 | |||
343 | Say Y here if you want to enable RCU tracing | ||
344 | Say N if you are unsure. | ||
345 | |||
346 | config RCU_FANOUT | ||
347 | int "Tree-based hierarchical RCU fanout value" | ||
348 | range 2 64 if 64BIT | ||
349 | range 2 32 if !64BIT | ||
350 | depends on TREE_RCU | ||
351 | default 64 if 64BIT | ||
352 | default 32 if !64BIT | ||
353 | help | ||
354 | This option controls the fanout of hierarchical implementations | ||
355 | of RCU, allowing RCU to work efficiently on machines with | ||
356 | large numbers of CPUs. This value must be at least the cube | ||
357 | root of NR_CPUS, which allows NR_CPUS up to 32,768 for 32-bit | ||
358 | systems and up to 262,144 for 64-bit systems. | ||
359 | |||
360 | Select a specific number if testing RCU itself. | ||
361 | Take the default if unsure. | ||
362 | |||
363 | config RCU_FANOUT_EXACT | ||
364 | bool "Disable tree-based hierarchical RCU auto-balancing" | ||
365 | depends on TREE_RCU | ||
366 | default n | ||
367 | help | ||
368 | This option forces use of the exact RCU_FANOUT value specified, | ||
369 | regardless of imbalances in the hierarchy. This is useful for | ||
370 | testing RCU itself, and might one day be useful on systems with | ||
371 | strong NUMA behavior. | ||
372 | |||
373 | Without RCU_FANOUT_EXACT, the code will balance the hierarchy. | ||
374 | |||
375 | Say N if unsure. | ||
376 | |||
377 | config TREE_RCU_TRACE | ||
378 | def_bool RCU_TRACE && TREE_RCU | ||
379 | select DEBUG_FS | ||
380 | help | ||
381 | This option provides tracing for the TREE_RCU implementation, | ||
382 | permitting Makefile to trivially select kernel/rcutree_trace.c. | ||
383 | |||
384 | config PREEMPT_RCU_TRACE | ||
385 | def_bool RCU_TRACE && PREEMPT_RCU | ||
386 | select DEBUG_FS | ||
387 | help | ||
388 | This option provides tracing for the PREEMPT_RCU implementation, | ||
389 | permitting Makefile to trivially select kernel/rcupreempt_trace.c. | ||
390 | |||
391 | endmenu # "RCU Subsystem" | ||
392 | |||
301 | config IKCONFIG | 393 | config IKCONFIG |
302 | tristate "Kernel .config support" | 394 | tristate "Kernel .config support" |
303 | ---help--- | 395 | ---help--- |
@@ -383,26 +475,26 @@ config CGROUP_SCHED | |||
383 | This option allows you to create arbitrary task groups | 475 | This option allows you to create arbitrary task groups |
384 | using the "cgroup" pseudo filesystem and control | 476 | using the "cgroup" pseudo filesystem and control |
385 | the cpu bandwidth allocated to each such task group. | 477 | the cpu bandwidth allocated to each such task group. |
386 | Refer to Documentation/cgroups.txt for more information | 478 | Refer to Documentation/cgroups/cgroups.txt for more |
387 | on "cgroup" pseudo filesystem. | 479 | information on "cgroup" pseudo filesystem. |
388 | 480 | ||
389 | endchoice | 481 | endchoice |
390 | 482 | ||
391 | menu "Control Group support" | 483 | menuconfig CGROUPS |
392 | config CGROUPS | 484 | boolean "Control Group support" |
393 | bool "Control Group support" | ||
394 | help | 485 | help |
395 | This option add support for grouping sets of processes together, for | 486 | This option adds support for grouping sets of processes together, for |
396 | use with process control subsystems such as Cpusets, CFS, memory | 487 | use with process control subsystems such as Cpusets, CFS, memory |
397 | controls or device isolation. | 488 | controls or device isolation. |
398 | See | 489 | See |
399 | - Documentation/cpusets.txt (Cpusets) | ||
400 | - Documentation/scheduler/sched-design-CFS.txt (CFS) | 490 | - Documentation/scheduler/sched-design-CFS.txt (CFS) |
401 | - Documentation/cgroups/ (features for grouping, isolation) | 491 | - Documentation/cgroups/ (features for grouping, isolation |
402 | - Documentation/controllers/ (features for resource control) | 492 | and resource control) |
403 | 493 | ||
404 | Say N if unsure. | 494 | Say N if unsure. |
405 | 495 | ||
496 | if CGROUPS | ||
497 | |||
406 | config CGROUP_DEBUG | 498 | config CGROUP_DEBUG |
407 | bool "Example debug cgroup subsystem" | 499 | bool "Example debug cgroup subsystem" |
408 | depends on CGROUPS | 500 | depends on CGROUPS |
@@ -410,24 +502,24 @@ config CGROUP_DEBUG | |||
410 | help | 502 | help |
411 | This option enables a simple cgroup subsystem that | 503 | This option enables a simple cgroup subsystem that |
412 | exports useful debugging information about the cgroups | 504 | exports useful debugging information about the cgroups |
413 | framework | 505 | framework. |
414 | 506 | ||
415 | Say N if unsure | 507 | Say N if unsure. |
416 | 508 | ||
417 | config CGROUP_NS | 509 | config CGROUP_NS |
418 | bool "Namespace cgroup subsystem" | 510 | bool "Namespace cgroup subsystem" |
419 | depends on CGROUPS | 511 | depends on CGROUPS |
420 | help | 512 | help |
421 | Provides a simple namespace cgroup subsystem to | 513 | Provides a simple namespace cgroup subsystem to |
422 | provide hierarchical naming of sets of namespaces, | 514 | provide hierarchical naming of sets of namespaces, |
423 | for instance virtual servers and checkpoint/restart | 515 | for instance virtual servers and checkpoint/restart |
424 | jobs. | 516 | jobs. |
425 | 517 | ||
426 | config CGROUP_FREEZER | 518 | config CGROUP_FREEZER |
427 | bool "control group freezer subsystem" | 519 | bool "Freezer cgroup subsystem" |
428 | depends on CGROUPS | 520 | depends on CGROUPS |
429 | help | 521 | help |
430 | Provides a way to freeze and unfreeze all tasks in a | 522 | Provides a way to freeze and unfreeze all tasks in a |
431 | cgroup. | 523 | cgroup. |
432 | 524 | ||
433 | config CGROUP_DEVICE | 525 | config CGROUP_DEVICE |
@@ -448,18 +540,23 @@ config CPUSETS | |||
448 | 540 | ||
449 | Say N if unsure. | 541 | Say N if unsure. |
450 | 542 | ||
543 | config PROC_PID_CPUSET | ||
544 | bool "Include legacy /proc/<pid>/cpuset file" | ||
545 | depends on CPUSETS | ||
546 | default y | ||
547 | |||
451 | config CGROUP_CPUACCT | 548 | config CGROUP_CPUACCT |
452 | bool "Simple CPU accounting cgroup subsystem" | 549 | bool "Simple CPU accounting cgroup subsystem" |
453 | depends on CGROUPS | 550 | depends on CGROUPS |
454 | help | 551 | help |
455 | Provides a simple Resource Controller for monitoring the | 552 | Provides a simple Resource Controller for monitoring the |
456 | total CPU consumed by the tasks in a cgroup | 553 | total CPU consumed by the tasks in a cgroup. |
457 | 554 | ||
458 | config RESOURCE_COUNTERS | 555 | config RESOURCE_COUNTERS |
459 | bool "Resource counters" | 556 | bool "Resource counters" |
460 | help | 557 | help |
461 | This option enables controller independent resource accounting | 558 | This option enables controller independent resource accounting |
462 | infrastructure that works with cgroups | 559 | infrastructure that works with cgroups. |
463 | depends on CGROUPS | 560 | depends on CGROUPS |
464 | 561 | ||
465 | config CGROUP_MEM_RES_CTLR | 562 | config CGROUP_MEM_RES_CTLR |
@@ -485,9 +582,6 @@ config CGROUP_MEM_RES_CTLR | |||
485 | This config option also selects MM_OWNER config option, which | 582 | This config option also selects MM_OWNER config option, which |
486 | could in turn add some fork/exit overhead. | 583 | could in turn add some fork/exit overhead. |
487 | 584 | ||
488 | config MM_OWNER | ||
489 | bool | ||
490 | |||
491 | config CGROUP_MEM_RES_CTLR_SWAP | 585 | config CGROUP_MEM_RES_CTLR_SWAP |
492 | bool "Memory Resource Controller Swap Extension(EXPERIMENTAL)" | 586 | bool "Memory Resource Controller Swap Extension(EXPERIMENTAL)" |
493 | depends on CGROUP_MEM_RES_CTLR && SWAP && EXPERIMENTAL | 587 | depends on CGROUP_MEM_RES_CTLR && SWAP && EXPERIMENTAL |
@@ -504,8 +598,10 @@ config CGROUP_MEM_RES_CTLR_SWAP | |||
504 | there will be no overhead from this. Even when you set this config=y, | 598 | there will be no overhead from this. Even when you set this config=y, |
505 | if boot option "noswapaccount" is set, swap will not be accounted. | 599 | if boot option "noswapaccount" is set, swap will not be accounted. |
506 | 600 | ||
601 | endif # CGROUPS | ||
507 | 602 | ||
508 | endmenu | 603 | config MM_OWNER |
604 | bool | ||
509 | 605 | ||
510 | config SYSFS_DEPRECATED | 606 | config SYSFS_DEPRECATED |
511 | bool | 607 | bool |
@@ -543,11 +639,6 @@ config SYSFS_DEPRECATED_V2 | |||
543 | if the original kernel, that came with your distribution, has | 639 | if the original kernel, that came with your distribution, has |
544 | this option set to N. | 640 | this option set to N. |
545 | 641 | ||
546 | config PROC_PID_CPUSET | ||
547 | bool "Include legacy /proc/<pid>/cpuset file" | ||
548 | depends on CPUSETS | ||
549 | default y | ||
550 | |||
551 | config RELAY | 642 | config RELAY |
552 | bool "Kernel->user space relay support (formerly relayfs)" | 643 | bool "Kernel->user space relay support (formerly relayfs)" |
553 | help | 644 | help |
@@ -602,6 +693,14 @@ config PID_NS | |||
602 | Unless you want to work with an experimental feature | 693 | Unless you want to work with an experimental feature |
603 | say N here. | 694 | say N here. |
604 | 695 | ||
696 | config NET_NS | ||
697 | bool "Network namespace" | ||
698 | default n | ||
699 | depends on NAMESPACES && EXPERIMENTAL && NET | ||
700 | help | ||
701 | Allow user space to create what appear to be multiple instances | ||
702 | of the network stack. | ||
703 | |||
605 | config BLK_DEV_INITRD | 704 | config BLK_DEV_INITRD |
606 | bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support" | 705 | bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support" |
607 | depends on BROKEN || !FRV | 706 | depends on BROKEN || !FRV |
@@ -686,13 +785,6 @@ config KALLSYMS_ALL | |||
686 | 785 | ||
687 | Say N. | 786 | Say N. |
688 | 787 | ||
689 | config KALLSYMS_STRIP_GENERATED | ||
690 | bool "Strip machine generated symbols from kallsyms" | ||
691 | depends on KALLSYMS_ALL | ||
692 | default y | ||
693 | help | ||
694 | Say N if you want kallsyms to retain even machine generated symbols. | ||
695 | |||
696 | config KALLSYMS_EXTRA_PASS | 788 | config KALLSYMS_EXTRA_PASS |
697 | bool "Do an extra kallsyms pass" | 789 | bool "Do an extra kallsyms pass" |
698 | depends on KALLSYMS | 790 | depends on KALLSYMS |
@@ -1033,90 +1125,3 @@ source "block/Kconfig" | |||
1033 | config PREEMPT_NOTIFIERS | 1125 | config PREEMPT_NOTIFIERS |
1034 | bool | 1126 | bool |
1035 | 1127 | ||
1036 | choice | ||
1037 | prompt "RCU Implementation" | ||
1038 | default CLASSIC_RCU | ||
1039 | |||
1040 | config CLASSIC_RCU | ||
1041 | bool "Classic RCU" | ||
1042 | help | ||
1043 | This option selects the classic RCU implementation that is | ||
1044 | designed for best read-side performance on non-realtime | ||
1045 | systems. | ||
1046 | |||
1047 | Select this option if you are unsure. | ||
1048 | |||
1049 | config TREE_RCU | ||
1050 | bool "Tree-based hierarchical RCU" | ||
1051 | help | ||
1052 | This option selects the RCU implementation that is | ||
1053 | designed for very large SMP system with hundreds or | ||
1054 | thousands of CPUs. | ||
1055 | |||
1056 | config PREEMPT_RCU | ||
1057 | bool "Preemptible RCU" | ||
1058 | depends on PREEMPT | ||
1059 | help | ||
1060 | This option reduces the latency of the kernel by making certain | ||
1061 | RCU sections preemptible. Normally RCU code is non-preemptible, if | ||
1062 | this option is selected then read-only RCU sections become | ||
1063 | preemptible. This helps latency, but may expose bugs due to | ||
1064 | now-naive assumptions about each RCU read-side critical section | ||
1065 | remaining on a given CPU through its execution. | ||
1066 | |||
1067 | endchoice | ||
1068 | |||
1069 | config RCU_TRACE | ||
1070 | bool "Enable tracing for RCU" | ||
1071 | depends on TREE_RCU || PREEMPT_RCU | ||
1072 | help | ||
1073 | This option provides tracing in RCU which presents stats | ||
1074 | in debugfs for debugging RCU implementation. | ||
1075 | |||
1076 | Say Y here if you want to enable RCU tracing | ||
1077 | Say N if you are unsure. | ||
1078 | |||
1079 | config RCU_FANOUT | ||
1080 | int "Tree-based hierarchical RCU fanout value" | ||
1081 | range 2 64 if 64BIT | ||
1082 | range 2 32 if !64BIT | ||
1083 | depends on TREE_RCU | ||
1084 | default 64 if 64BIT | ||
1085 | default 32 if !64BIT | ||
1086 | help | ||
1087 | This option controls the fanout of hierarchical implementations | ||
1088 | of RCU, allowing RCU to work efficiently on machines with | ||
1089 | large numbers of CPUs. This value must be at least the cube | ||
1090 | root of NR_CPUS, which allows NR_CPUS up to 32,768 for 32-bit | ||
1091 | systems and up to 262,144 for 64-bit systems. | ||
1092 | |||
1093 | Select a specific number if testing RCU itself. | ||
1094 | Take the default if unsure. | ||
1095 | |||
1096 | config RCU_FANOUT_EXACT | ||
1097 | bool "Disable tree-based hierarchical RCU auto-balancing" | ||
1098 | depends on TREE_RCU | ||
1099 | default n | ||
1100 | help | ||
1101 | This option forces use of the exact RCU_FANOUT value specified, | ||
1102 | regardless of imbalances in the hierarchy. This is useful for | ||
1103 | testing RCU itself, and might one day be useful on systems with | ||
1104 | strong NUMA behavior. | ||
1105 | |||
1106 | Without RCU_FANOUT_EXACT, the code will balance the hierarchy. | ||
1107 | |||
1108 | Say N if unsure. | ||
1109 | |||
1110 | config TREE_RCU_TRACE | ||
1111 | def_bool RCU_TRACE && TREE_RCU | ||
1112 | select DEBUG_FS | ||
1113 | help | ||
1114 | This option provides tracing for the TREE_RCU implementation, | ||
1115 | permitting Makefile to trivially select kernel/rcutree_trace.c. | ||
1116 | |||
1117 | config PREEMPT_RCU_TRACE | ||
1118 | def_bool RCU_TRACE && PREEMPT_RCU | ||
1119 | select DEBUG_FS | ||
1120 | help | ||
1121 | This option provides tracing for the PREEMPT_RCU implementation, | ||
1122 | permitting Makefile to trivially select kernel/rcupreempt_trace.c. | ||