diff options
-rw-r--r-- | arch/i386/Kconfig | 13 | ||||
-rw-r--r-- | arch/i386/Kconfig.debug | 10 | ||||
-rw-r--r-- | arch/i386/oprofile/Kconfig | 6 | ||||
-rw-r--r-- | arch/ia64/Kconfig | 13 | ||||
-rw-r--r-- | arch/ia64/Kconfig.debug | 11 | ||||
-rw-r--r-- | arch/ia64/oprofile/Kconfig | 6 | ||||
-rw-r--r-- | arch/powerpc/Kconfig | 13 | ||||
-rw-r--r-- | arch/powerpc/Kconfig.debug | 10 | ||||
-rw-r--r-- | arch/powerpc/oprofile/Kconfig | 6 | ||||
-rw-r--r-- | arch/sparc64/Kconfig | 13 | ||||
-rw-r--r-- | arch/sparc64/Kconfig.debug | 10 | ||||
-rw-r--r-- | arch/sparc64/oprofile/Kconfig | 6 | ||||
-rw-r--r-- | arch/x86_64/Kconfig | 13 | ||||
-rw-r--r-- | arch/x86_64/Kconfig.debug | 10 | ||||
-rw-r--r-- | arch/x86_64/oprofile/Kconfig | 6 |
15 files changed, 65 insertions, 81 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index bac0da731ee3..dbf90ad6eac3 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig | |||
@@ -997,8 +997,21 @@ source "drivers/Kconfig" | |||
997 | 997 | ||
998 | source "fs/Kconfig" | 998 | source "fs/Kconfig" |
999 | 999 | ||
1000 | menu "Instrumentation Support" | ||
1001 | depends on EXPERIMENTAL | ||
1002 | |||
1000 | source "arch/i386/oprofile/Kconfig" | 1003 | source "arch/i386/oprofile/Kconfig" |
1001 | 1004 | ||
1005 | config KPROBES | ||
1006 | bool "Kprobes (EXPERIMENTAL)" | ||
1007 | help | ||
1008 | Kprobes allows you to trap at almost any kernel address and | ||
1009 | execute a callback function. register_kprobe() establishes | ||
1010 | a probepoint and specifies the callback. Kprobes is useful | ||
1011 | for kernel debugging, non-intrusive instrumentation and testing. | ||
1012 | If in doubt, say "N". | ||
1013 | endmenu | ||
1014 | |||
1002 | source "arch/i386/Kconfig.debug" | 1015 | source "arch/i386/Kconfig.debug" |
1003 | 1016 | ||
1004 | source "security/Kconfig" | 1017 | source "security/Kconfig" |
diff --git a/arch/i386/Kconfig.debug b/arch/i386/Kconfig.debug index 5228c40a6fb2..c48b424dd640 100644 --- a/arch/i386/Kconfig.debug +++ b/arch/i386/Kconfig.debug | |||
@@ -22,16 +22,6 @@ config DEBUG_STACKOVERFLOW | |||
22 | This option will cause messages to be printed if free stack space | 22 | This option will cause messages to be printed if free stack space |
23 | drops below a certain limit. | 23 | drops below a certain limit. |
24 | 24 | ||
25 | config KPROBES | ||
26 | bool "Kprobes" | ||
27 | depends on DEBUG_KERNEL | ||
28 | help | ||
29 | Kprobes allows you to trap at almost any kernel address and | ||
30 | execute a callback function. register_kprobe() establishes | ||
31 | a probepoint and specifies the callback. Kprobes is useful | ||
32 | for kernel debugging, non-intrusive instrumentation and testing. | ||
33 | If in doubt, say "N". | ||
34 | |||
35 | config DEBUG_STACK_USAGE | 25 | config DEBUG_STACK_USAGE |
36 | bool "Stack utilization instrumentation" | 26 | bool "Stack utilization instrumentation" |
37 | depends on DEBUG_KERNEL | 27 | depends on DEBUG_KERNEL |
diff --git a/arch/i386/oprofile/Kconfig b/arch/i386/oprofile/Kconfig index 5ade19801b97..d8a84088471a 100644 --- a/arch/i386/oprofile/Kconfig +++ b/arch/i386/oprofile/Kconfig | |||
@@ -1,7 +1,3 @@ | |||
1 | |||
2 | menu "Profiling support" | ||
3 | depends on EXPERIMENTAL | ||
4 | |||
5 | config PROFILING | 1 | config PROFILING |
6 | bool "Profiling support (EXPERIMENTAL)" | 2 | bool "Profiling support (EXPERIMENTAL)" |
7 | help | 3 | help |
@@ -19,5 +15,3 @@ config OPROFILE | |||
19 | 15 | ||
20 | If unsure, say N. | 16 | If unsure, say N. |
21 | 17 | ||
22 | endmenu | ||
23 | |||
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 3b4248cff9a7..9f2093c1f44b 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
@@ -426,8 +426,21 @@ config GENERIC_PENDING_IRQ | |||
426 | 426 | ||
427 | source "arch/ia64/hp/sim/Kconfig" | 427 | source "arch/ia64/hp/sim/Kconfig" |
428 | 428 | ||
429 | menu "Instrumentation Support" | ||
430 | depends on EXPERIMENTAL | ||
431 | |||
429 | source "arch/ia64/oprofile/Kconfig" | 432 | source "arch/ia64/oprofile/Kconfig" |
430 | 433 | ||
434 | config KPROBES | ||
435 | bool "Kprobes (EXPERIMENTAL)" | ||
436 | help | ||
437 | Kprobes allows you to trap at almost any kernel address and | ||
438 | execute a callback function. register_kprobe() establishes | ||
439 | a probepoint and specifies the callback. Kprobes is useful | ||
440 | for kernel debugging, non-intrusive instrumentation and testing. | ||
441 | If in doubt, say "N". | ||
442 | endmenu | ||
443 | |||
431 | source "arch/ia64/Kconfig.debug" | 444 | source "arch/ia64/Kconfig.debug" |
432 | 445 | ||
433 | source "security/Kconfig" | 446 | source "security/Kconfig" |
diff --git a/arch/ia64/Kconfig.debug b/arch/ia64/Kconfig.debug index fda67ac993d7..de9d507ba0fd 100644 --- a/arch/ia64/Kconfig.debug +++ b/arch/ia64/Kconfig.debug | |||
@@ -2,17 +2,6 @@ menu "Kernel hacking" | |||
2 | 2 | ||
3 | source "lib/Kconfig.debug" | 3 | source "lib/Kconfig.debug" |
4 | 4 | ||
5 | config KPROBES | ||
6 | bool "Kprobes" | ||
7 | depends on DEBUG_KERNEL | ||
8 | help | ||
9 | Kprobes allows you to trap at almost any kernel address and | ||
10 | execute a callback function. register_kprobe() establishes | ||
11 | a probepoint and specifies the callback. Kprobes is useful | ||
12 | for kernel debugging, non-intrusive instrumentation and testing. | ||
13 | If in doubt, say "N". | ||
14 | |||
15 | |||
16 | choice | 5 | choice |
17 | prompt "Physical memory granularity" | 6 | prompt "Physical memory granularity" |
18 | default IA64_GRANULE_64MB | 7 | default IA64_GRANULE_64MB |
diff --git a/arch/ia64/oprofile/Kconfig b/arch/ia64/oprofile/Kconfig index 56e6f614b04a..97271ab484dc 100644 --- a/arch/ia64/oprofile/Kconfig +++ b/arch/ia64/oprofile/Kconfig | |||
@@ -1,7 +1,3 @@ | |||
1 | |||
2 | menu "Profiling support" | ||
3 | depends on EXPERIMENTAL | ||
4 | |||
5 | config PROFILING | 1 | config PROFILING |
6 | bool "Profiling support (EXPERIMENTAL)" | 2 | bool "Profiling support (EXPERIMENTAL)" |
7 | help | 3 | help |
@@ -22,5 +18,3 @@ config OPROFILE | |||
22 | 18 | ||
23 | If unsure, say N. | 19 | If unsure, say N. |
24 | 20 | ||
25 | endmenu | ||
26 | |||
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 55ce49570524..6ffae2d2b3fa 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -917,8 +917,21 @@ source "arch/powerpc/platforms/iseries/Kconfig" | |||
917 | 917 | ||
918 | source "lib/Kconfig" | 918 | source "lib/Kconfig" |
919 | 919 | ||
920 | menu "Instrumentation Support" | ||
921 | depends on EXPERIMENTAL | ||
922 | |||
920 | source "arch/powerpc/oprofile/Kconfig" | 923 | source "arch/powerpc/oprofile/Kconfig" |
921 | 924 | ||
925 | config KPROBES | ||
926 | bool "Kprobes (EXPERIMENTAL)" | ||
927 | help | ||
928 | Kprobes allows you to trap at almost any kernel address and | ||
929 | execute a callback function. register_kprobe() establishes | ||
930 | a probepoint and specifies the callback. Kprobes is useful | ||
931 | for kernel debugging, non-intrusive instrumentation and testing. | ||
932 | If in doubt, say "N". | ||
933 | endmenu | ||
934 | |||
922 | source "arch/powerpc/Kconfig.debug" | 935 | source "arch/powerpc/Kconfig.debug" |
923 | 936 | ||
924 | source "security/Kconfig" | 937 | source "security/Kconfig" |
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug index 0baf64ec80d0..30a30bf559ea 100644 --- a/arch/powerpc/Kconfig.debug +++ b/arch/powerpc/Kconfig.debug | |||
@@ -9,16 +9,6 @@ config DEBUG_STACKOVERFLOW | |||
9 | This option will cause messages to be printed if free stack space | 9 | This option will cause messages to be printed if free stack space |
10 | drops below a certain limit. | 10 | drops below a certain limit. |
11 | 11 | ||
12 | config KPROBES | ||
13 | bool "Kprobes" | ||
14 | depends on DEBUG_KERNEL && PPC64 | ||
15 | help | ||
16 | Kprobes allows you to trap at almost any kernel address and | ||
17 | execute a callback function. register_kprobe() establishes | ||
18 | a probepoint and specifies the callback. Kprobes is useful | ||
19 | for kernel debugging, non-intrusive instrumentation and testing. | ||
20 | If in doubt, say "N". | ||
21 | |||
22 | config DEBUG_STACK_USAGE | 12 | config DEBUG_STACK_USAGE |
23 | bool "Stack utilization instrumentation" | 13 | bool "Stack utilization instrumentation" |
24 | depends on DEBUG_KERNEL && PPC64 | 14 | depends on DEBUG_KERNEL && PPC64 |
diff --git a/arch/powerpc/oprofile/Kconfig b/arch/powerpc/oprofile/Kconfig index 19d37730b664..eb2dece76a54 100644 --- a/arch/powerpc/oprofile/Kconfig +++ b/arch/powerpc/oprofile/Kconfig | |||
@@ -1,7 +1,3 @@ | |||
1 | |||
2 | menu "Profiling support" | ||
3 | depends on EXPERIMENTAL | ||
4 | |||
5 | config PROFILING | 1 | config PROFILING |
6 | bool "Profiling support (EXPERIMENTAL)" | 2 | bool "Profiling support (EXPERIMENTAL)" |
7 | help | 3 | help |
@@ -19,5 +15,3 @@ config OPROFILE | |||
19 | 15 | ||
20 | If unsure, say N. | 16 | If unsure, say N. |
21 | 17 | ||
22 | endmenu | ||
23 | |||
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index 1e9d8638a28a..3fded69b1922 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig | |||
@@ -377,8 +377,21 @@ source "drivers/fc4/Kconfig" | |||
377 | 377 | ||
378 | source "fs/Kconfig" | 378 | source "fs/Kconfig" |
379 | 379 | ||
380 | menu "Instrumentation Support" | ||
381 | depends on EXPERIMENTAL | ||
382 | |||
380 | source "arch/sparc64/oprofile/Kconfig" | 383 | source "arch/sparc64/oprofile/Kconfig" |
381 | 384 | ||
385 | config KPROBES | ||
386 | bool "Kprobes (EXPERIMENTAL)" | ||
387 | help | ||
388 | Kprobes allows you to trap at almost any kernel address and | ||
389 | execute a callback function. register_kprobe() establishes | ||
390 | a probepoint and specifies the callback. Kprobes is useful | ||
391 | for kernel debugging, non-intrusive instrumentation and testing. | ||
392 | If in doubt, say "N". | ||
393 | endmenu | ||
394 | |||
382 | source "arch/sparc64/Kconfig.debug" | 395 | source "arch/sparc64/Kconfig.debug" |
383 | 396 | ||
384 | source "security/Kconfig" | 397 | source "security/Kconfig" |
diff --git a/arch/sparc64/Kconfig.debug b/arch/sparc64/Kconfig.debug index fa06ea04837b..3e31be494e54 100644 --- a/arch/sparc64/Kconfig.debug +++ b/arch/sparc64/Kconfig.debug | |||
@@ -11,16 +11,6 @@ config DEBUG_STACK_USAGE | |||
11 | 11 | ||
12 | This option will slow down process creation somewhat. | 12 | This option will slow down process creation somewhat. |
13 | 13 | ||
14 | config KPROBES | ||
15 | bool "Kprobes" | ||
16 | depends on DEBUG_KERNEL | ||
17 | help | ||
18 | Kprobes allows you to trap at almost any kernel address and | ||
19 | execute a callback function. register_kprobe() establishes | ||
20 | a probepoint and specifies the callback. Kprobes is useful | ||
21 | for kernel debugging, non-intrusive instrumentation and testing. | ||
22 | If in doubt, say "N". | ||
23 | |||
24 | config DEBUG_DCFLUSH | 14 | config DEBUG_DCFLUSH |
25 | bool "D-cache flush debugging" | 15 | bool "D-cache flush debugging" |
26 | depends on DEBUG_KERNEL | 16 | depends on DEBUG_KERNEL |
diff --git a/arch/sparc64/oprofile/Kconfig b/arch/sparc64/oprofile/Kconfig index 5ade19801b97..d8a84088471a 100644 --- a/arch/sparc64/oprofile/Kconfig +++ b/arch/sparc64/oprofile/Kconfig | |||
@@ -1,7 +1,3 @@ | |||
1 | |||
2 | menu "Profiling support" | ||
3 | depends on EXPERIMENTAL | ||
4 | |||
5 | config PROFILING | 1 | config PROFILING |
6 | bool "Profiling support (EXPERIMENTAL)" | 2 | bool "Profiling support (EXPERIMENTAL)" |
7 | help | 3 | help |
@@ -19,5 +15,3 @@ config OPROFILE | |||
19 | 15 | ||
20 | If unsure, say N. | 16 | If unsure, say N. |
21 | 17 | ||
22 | endmenu | ||
23 | |||
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig index 21afa69a086d..4cce2f6f170c 100644 --- a/arch/x86_64/Kconfig +++ b/arch/x86_64/Kconfig | |||
@@ -532,8 +532,21 @@ source "drivers/firmware/Kconfig" | |||
532 | 532 | ||
533 | source fs/Kconfig | 533 | source fs/Kconfig |
534 | 534 | ||
535 | menu "Instrumentation Support" | ||
536 | depends on EXPERIMENTAL | ||
537 | |||
535 | source "arch/x86_64/oprofile/Kconfig" | 538 | source "arch/x86_64/oprofile/Kconfig" |
536 | 539 | ||
540 | config KPROBES | ||
541 | bool "Kprobes (EXPERIMENTAL)" | ||
542 | help | ||
543 | Kprobes allows you to trap at almost any kernel address and | ||
544 | execute a callback function. register_kprobe() establishes | ||
545 | a probepoint and specifies the callback. Kprobes is useful | ||
546 | for kernel debugging, non-intrusive instrumentation and testing. | ||
547 | If in doubt, say "N". | ||
548 | endmenu | ||
549 | |||
537 | source "arch/x86_64/Kconfig.debug" | 550 | source "arch/x86_64/Kconfig.debug" |
538 | 551 | ||
539 | source "security/Kconfig" | 552 | source "security/Kconfig" |
diff --git a/arch/x86_64/Kconfig.debug b/arch/x86_64/Kconfig.debug index 9cf1410d2f5a..d584ecc27ea1 100644 --- a/arch/x86_64/Kconfig.debug +++ b/arch/x86_64/Kconfig.debug | |||
@@ -33,16 +33,6 @@ config IOMMU_DEBUG | |||
33 | options. See Documentation/x86_64/boot-options.txt for more | 33 | options. See Documentation/x86_64/boot-options.txt for more |
34 | details. | 34 | details. |
35 | 35 | ||
36 | config KPROBES | ||
37 | bool "Kprobes" | ||
38 | depends on DEBUG_KERNEL | ||
39 | help | ||
40 | Kprobes allows you to trap at almost any kernel address and | ||
41 | execute a callback function. register_kprobe() establishes | ||
42 | a probepoint and specifies the callback. Kprobes is useful | ||
43 | for kernel debugging, non-intrusive instrumentation and testing. | ||
44 | If in doubt, say "N". | ||
45 | |||
46 | config IOMMU_LEAK | 36 | config IOMMU_LEAK |
47 | bool "IOMMU leak tracing" | 37 | bool "IOMMU leak tracing" |
48 | depends on DEBUG_KERNEL | 38 | depends on DEBUG_KERNEL |
diff --git a/arch/x86_64/oprofile/Kconfig b/arch/x86_64/oprofile/Kconfig index 5ade19801b97..d8a84088471a 100644 --- a/arch/x86_64/oprofile/Kconfig +++ b/arch/x86_64/oprofile/Kconfig | |||
@@ -1,7 +1,3 @@ | |||
1 | |||
2 | menu "Profiling support" | ||
3 | depends on EXPERIMENTAL | ||
4 | |||
5 | config PROFILING | 1 | config PROFILING |
6 | bool "Profiling support (EXPERIMENTAL)" | 2 | bool "Profiling support (EXPERIMENTAL)" |
7 | help | 3 | help |
@@ -19,5 +15,3 @@ config OPROFILE | |||
19 | 15 | ||
20 | If unsure, say N. | 16 | If unsure, say N. |
21 | 17 | ||
22 | endmenu | ||
23 | |||