diff options
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/init/Kconfig b/init/Kconfig index 09c5c6431f42..eb4b33725db1 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -297,7 +297,7 @@ config AUDIT | |||
| 297 | 297 | ||
| 298 | config AUDITSYSCALL | 298 | config AUDITSYSCALL |
| 299 | bool "Enable system-call auditing support" | 299 | bool "Enable system-call auditing support" |
| 300 | depends on AUDIT && (X86 || PPC || PPC64 || S390 || IA64 || UML || SPARC64|| SUPERH) | 300 | depends on AUDIT && (X86 || PPC || S390 || IA64 || UML || SPARC64 || SUPERH) |
| 301 | default y if SECURITY_SELINUX | 301 | default y if SECURITY_SELINUX |
| 302 | help | 302 | help |
| 303 | Enable low-overhead system-call auditing infrastructure that | 303 | Enable low-overhead system-call auditing infrastructure that |
| @@ -606,7 +606,7 @@ config SYSFS_DEPRECATED | |||
| 606 | bool | 606 | bool |
| 607 | 607 | ||
| 608 | config SYSFS_DEPRECATED_V2 | 608 | config SYSFS_DEPRECATED_V2 |
| 609 | bool "remove sysfs features which may confuse old userspace tools" | 609 | bool "enable deprecated sysfs features which may confuse old userspace tools" |
| 610 | depends on SYSFS | 610 | depends on SYSFS |
| 611 | default n | 611 | default n |
| 612 | select SYSFS_DEPRECATED | 612 | select SYSFS_DEPRECATED |
| @@ -937,7 +937,7 @@ config PERF_EVENTS | |||
| 937 | Enable kernel support for various performance events provided | 937 | Enable kernel support for various performance events provided |
| 938 | by software and hardware. | 938 | by software and hardware. |
| 939 | 939 | ||
| 940 | Software events are supported either build-in or via the | 940 | Software events are supported either built-in or via the |
| 941 | use of generic tracepoints. | 941 | use of generic tracepoints. |
| 942 | 942 | ||
| 943 | Most modern CPUs support performance events via performance | 943 | Most modern CPUs support performance events via performance |
| @@ -949,7 +949,7 @@ config PERF_EVENTS | |||
| 949 | used to profile the code that runs on that CPU. | 949 | used to profile the code that runs on that CPU. |
| 950 | 950 | ||
| 951 | The Linux Performance Event subsystem provides an abstraction of | 951 | The Linux Performance Event subsystem provides an abstraction of |
| 952 | these software and hardware cevent apabilities, available via a | 952 | these software and hardware event capabilities, available via a |
| 953 | system call and used by the "perf" utility in tools/perf/. It | 953 | system call and used by the "perf" utility in tools/perf/. It |
| 954 | provides per task and per CPU counters, and it provides event | 954 | provides per task and per CPU counters, and it provides event |
| 955 | capabilities on top of those. | 955 | capabilities on top of those. |
| @@ -1098,6 +1098,16 @@ config SLOW_WORK | |||
| 1098 | 1098 | ||
| 1099 | See Documentation/slow-work.txt. | 1099 | See Documentation/slow-work.txt. |
| 1100 | 1100 | ||
| 1101 | config SLOW_WORK_DEBUG | ||
| 1102 | bool "Slow work debugging through debugfs" | ||
| 1103 | default n | ||
| 1104 | depends on SLOW_WORK && DEBUG_FS | ||
| 1105 | help | ||
| 1106 | Display the contents of the slow work run queue through debugfs, | ||
| 1107 | including items currently executing. | ||
| 1108 | |||
| 1109 | See Documentation/slow-work.txt. | ||
| 1110 | |||
| 1101 | endmenu # General setup | 1111 | endmenu # General setup |
| 1102 | 1112 | ||
| 1103 | config HAVE_GENERIC_DMA_COHERENT | 1113 | config HAVE_GENERIC_DMA_COHERENT |
