diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/Kconfig | 28 | ||||
-rw-r--r-- | arch/alpha/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/Kconfig | 2 | ||||
-rw-r--r-- | arch/blackfin/Kconfig | 2 | ||||
-rw-r--r-- | arch/cris/Kconfig | 2 | ||||
-rw-r--r-- | arch/frv/Kconfig | 2 | ||||
-rw-r--r-- | arch/h8300/Kconfig | 2 | ||||
-rw-r--r-- | arch/ia64/Kconfig | 2 | ||||
-rw-r--r-- | arch/m32r/Kconfig | 2 | ||||
-rw-r--r-- | arch/m68k/Kconfig | 2 | ||||
-rw-r--r-- | arch/m68knommu/Kconfig | 2 | ||||
-rw-r--r-- | arch/mips/Kconfig | 2 | ||||
-rw-r--r-- | arch/parisc/Kconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/Kconfig | 2 | ||||
-rw-r--r-- | arch/ppc/Kconfig | 2 | ||||
-rw-r--r-- | arch/s390/Kconfig | 2 | ||||
-rw-r--r-- | arch/sh/Kconfig | 2 | ||||
-rw-r--r-- | arch/sparc/Kconfig | 2 | ||||
-rw-r--r-- | arch/sparc64/Kconfig | 2 | ||||
-rw-r--r-- | arch/um/Kconfig | 2 | ||||
-rw-r--r-- | arch/v850/Kconfig | 2 | ||||
-rw-r--r-- | arch/x86/Kconfig | 2 | ||||
-rw-r--r-- | arch/xtensa/Kconfig | 2 |
23 files changed, 28 insertions, 44 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index 24917145058d..3d72dc3fc8f5 100644 --- a/arch/Kconfig +++ b/arch/Kconfig | |||
@@ -1,3 +1,31 @@ | |||
1 | # | 1 | # |
2 | # General architecture dependent options | 2 | # General architecture dependent options |
3 | # | 3 | # |
4 | |||
5 | config OPROFILE | ||
6 | tristate "OProfile system profiling (EXPERIMENTAL)" | ||
7 | depends on PROFILING | ||
8 | depends on HAVE_OPROFILE | ||
9 | help | ||
10 | OProfile is a profiling system capable of profiling the | ||
11 | whole system, include the kernel, kernel modules, libraries, | ||
12 | and applications. | ||
13 | |||
14 | If unsure, say N. | ||
15 | |||
16 | config HAVE_OPROFILE | ||
17 | def_bool n | ||
18 | |||
19 | config KPROBES | ||
20 | bool "Kprobes" | ||
21 | depends on KALLSYMS && MODULES | ||
22 | depends on HAVE_KPROBES | ||
23 | help | ||
24 | Kprobes allows you to trap at almost any kernel address and | ||
25 | execute a callback function. register_kprobe() establishes | ||
26 | a probepoint and specifies the callback. Kprobes is useful | ||
27 | for kernel debugging, non-intrusive instrumentation and testing. | ||
28 | If in doubt, say "N". | ||
29 | |||
30 | config HAVE_KPROBES | ||
31 | def_bool n | ||
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index 0ff5572b3b07..9abcd5fd8969 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig | |||
@@ -650,8 +650,6 @@ source "drivers/Kconfig" | |||
650 | 650 | ||
651 | source "fs/Kconfig" | 651 | source "fs/Kconfig" |
652 | 652 | ||
653 | source "kernel/Kconfig.instrumentation" | ||
654 | |||
655 | source "arch/alpha/Kconfig.debug" | 653 | source "arch/alpha/Kconfig.debug" |
656 | 654 | ||
657 | # DUMMY_CONSOLE may be defined in drivers/video/console/Kconfig | 655 | # DUMMY_CONSOLE may be defined in drivers/video/console/Kconfig |
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ea45eefbf832..36176f40dfdf 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -1147,8 +1147,6 @@ endmenu | |||
1147 | 1147 | ||
1148 | source "fs/Kconfig" | 1148 | source "fs/Kconfig" |
1149 | 1149 | ||
1150 | source "kernel/Kconfig.instrumentation" | ||
1151 | |||
1152 | source "arch/arm/Kconfig.debug" | 1150 | source "arch/arm/Kconfig.debug" |
1153 | 1151 | ||
1154 | source "security/Kconfig" | 1152 | source "security/Kconfig" |
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index 3ba89dc43297..ba21e33b8b1f 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
@@ -974,8 +974,6 @@ source "drivers/Kconfig" | |||
974 | 974 | ||
975 | source "fs/Kconfig" | 975 | source "fs/Kconfig" |
976 | 976 | ||
977 | source "kernel/Kconfig.instrumentation" | ||
978 | |||
979 | source "arch/blackfin/Kconfig.debug" | 977 | source "arch/blackfin/Kconfig.debug" |
980 | 978 | ||
981 | source "security/Kconfig" | 979 | source "security/Kconfig" |
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index 222da1501f47..7f0be4cd5e9a 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig | |||
@@ -213,8 +213,6 @@ source "drivers/pci/Kconfig" | |||
213 | 213 | ||
214 | source "drivers/usb/Kconfig" | 214 | source "drivers/usb/Kconfig" |
215 | 215 | ||
216 | source "kernel/Kconfig.instrumentation" | ||
217 | |||
218 | source "arch/cris/Kconfig.debug" | 216 | source "arch/cris/Kconfig.debug" |
219 | 217 | ||
220 | source "security/Kconfig" | 218 | source "security/Kconfig" |
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig index e3f965c91e22..68380cb2ff88 100644 --- a/arch/frv/Kconfig +++ b/arch/frv/Kconfig | |||
@@ -375,8 +375,6 @@ source "drivers/Kconfig" | |||
375 | 375 | ||
376 | source "fs/Kconfig" | 376 | source "fs/Kconfig" |
377 | 377 | ||
378 | source "kernel/Kconfig.instrumentation" | ||
379 | |||
380 | source "arch/frv/Kconfig.debug" | 378 | source "arch/frv/Kconfig.debug" |
381 | 379 | ||
382 | source "security/Kconfig" | 380 | source "security/Kconfig" |
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig index ff6a8712bd6d..dc61222e1120 100644 --- a/arch/h8300/Kconfig +++ b/arch/h8300/Kconfig | |||
@@ -223,8 +223,6 @@ endmenu | |||
223 | 223 | ||
224 | source "fs/Kconfig" | 224 | source "fs/Kconfig" |
225 | 225 | ||
226 | source "kernel/Kconfig.instrumentation" | ||
227 | |||
228 | source "arch/h8300/Kconfig.debug" | 226 | source "arch/h8300/Kconfig.debug" |
229 | 227 | ||
230 | source "security/Kconfig" | 228 | source "security/Kconfig" |
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 8db6324f7a83..a0740fbd94d9 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
@@ -602,8 +602,6 @@ config IRQ_PER_CPU | |||
602 | 602 | ||
603 | source "arch/ia64/hp/sim/Kconfig" | 603 | source "arch/ia64/hp/sim/Kconfig" |
604 | 604 | ||
605 | source "kernel/Kconfig.instrumentation" | ||
606 | |||
607 | source "arch/ia64/Kconfig.debug" | 605 | source "arch/ia64/Kconfig.debug" |
608 | 606 | ||
609 | source "security/Kconfig" | 607 | source "security/Kconfig" |
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index b93897d65aec..12259759a2fe 100644 --- a/arch/m32r/Kconfig +++ b/arch/m32r/Kconfig | |||
@@ -427,8 +427,6 @@ source "drivers/Kconfig" | |||
427 | 427 | ||
428 | source "fs/Kconfig" | 428 | source "fs/Kconfig" |
429 | 429 | ||
430 | source "kernel/Kconfig.instrumentation" | ||
431 | |||
432 | source "arch/m32r/Kconfig.debug" | 430 | source "arch/m32r/Kconfig.debug" |
433 | 431 | ||
434 | source "security/Kconfig" | 432 | source "security/Kconfig" |
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 24e6bc09e7a7..8236e42ef711 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig | |||
@@ -678,8 +678,6 @@ endmenu | |||
678 | 678 | ||
679 | source "fs/Kconfig" | 679 | source "fs/Kconfig" |
680 | 680 | ||
681 | source "kernel/Kconfig.instrumentation" | ||
682 | |||
683 | source "arch/m68k/Kconfig.debug" | 681 | source "arch/m68k/Kconfig.debug" |
684 | 682 | ||
685 | source "security/Kconfig" | 683 | source "security/Kconfig" |
diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig index bd9213749ac2..6abbbb8aac5e 100644 --- a/arch/m68knommu/Kconfig +++ b/arch/m68knommu/Kconfig | |||
@@ -711,8 +711,6 @@ source "drivers/Kconfig" | |||
711 | 711 | ||
712 | source "fs/Kconfig" | 712 | source "fs/Kconfig" |
713 | 713 | ||
714 | source "kernel/Kconfig.instrumentation" | ||
715 | |||
716 | source "arch/m68knommu/Kconfig.debug" | 714 | source "arch/m68knommu/Kconfig.debug" |
717 | 715 | ||
718 | source "security/Kconfig" | 716 | source "security/Kconfig" |
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index eb8be5491c13..d38ebd3b1201 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -2096,8 +2096,6 @@ source "drivers/Kconfig" | |||
2096 | 2096 | ||
2097 | source "fs/Kconfig" | 2097 | source "fs/Kconfig" |
2098 | 2098 | ||
2099 | source "kernel/Kconfig.instrumentation" | ||
2100 | |||
2101 | source "arch/mips/Kconfig.debug" | 2099 | source "arch/mips/Kconfig.debug" |
2102 | 2100 | ||
2103 | source "security/Kconfig" | 2101 | source "security/Kconfig" |
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index e1a2f77d3986..25c10fa69647 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig | |||
@@ -273,8 +273,6 @@ source "drivers/Kconfig" | |||
273 | 273 | ||
274 | source "fs/Kconfig" | 274 | source "fs/Kconfig" |
275 | 275 | ||
276 | source "kernel/Kconfig.instrumentation" | ||
277 | |||
278 | source "arch/parisc/Kconfig.debug" | 276 | source "arch/parisc/Kconfig.debug" |
279 | 277 | ||
280 | source "security/Kconfig" | 278 | source "security/Kconfig" |
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index c6f3eb58e4ed..b94d4502a477 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -715,8 +715,6 @@ source "arch/powerpc/sysdev/qe_lib/Kconfig" | |||
715 | 715 | ||
716 | source "lib/Kconfig" | 716 | source "lib/Kconfig" |
717 | 717 | ||
718 | source "kernel/Kconfig.instrumentation" | ||
719 | |||
720 | source "arch/powerpc/Kconfig.debug" | 718 | source "arch/powerpc/Kconfig.debug" |
721 | 719 | ||
722 | source "security/Kconfig" | 720 | source "security/Kconfig" |
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index 92e37f5b365b..531156f8919c 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig | |||
@@ -1258,8 +1258,6 @@ endmenu | |||
1258 | 1258 | ||
1259 | source "lib/Kconfig" | 1259 | source "lib/Kconfig" |
1260 | 1260 | ||
1261 | source "kernel/Kconfig.instrumentation" | ||
1262 | |||
1263 | source "arch/ppc/Kconfig.debug" | 1261 | source "arch/ppc/Kconfig.debug" |
1264 | 1262 | ||
1265 | source "security/Kconfig" | 1263 | source "security/Kconfig" |
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 272c6c80fd7b..974f9c3e89d9 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig | |||
@@ -528,8 +528,6 @@ source "drivers/Kconfig" | |||
528 | 528 | ||
529 | source "fs/Kconfig" | 529 | source "fs/Kconfig" |
530 | 530 | ||
531 | source "kernel/Kconfig.instrumentation" | ||
532 | |||
533 | source "arch/s390/Kconfig.debug" | 531 | source "arch/s390/Kconfig.debug" |
534 | 532 | ||
535 | source "security/Kconfig" | 533 | source "security/Kconfig" |
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index f868691801ba..bfbd54a22bde 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -897,8 +897,6 @@ source "drivers/Kconfig" | |||
897 | 897 | ||
898 | source "fs/Kconfig" | 898 | source "fs/Kconfig" |
899 | 899 | ||
900 | source "kernel/Kconfig.instrumentation" | ||
901 | |||
902 | source "arch/sh/Kconfig.debug" | 900 | source "arch/sh/Kconfig.debug" |
903 | 901 | ||
904 | source "security/Kconfig" | 902 | source "security/Kconfig" |
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 3d9bc2f0b471..51008a2ba5b4 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
@@ -321,8 +321,6 @@ endmenu | |||
321 | 321 | ||
322 | source "fs/Kconfig" | 322 | source "fs/Kconfig" |
323 | 323 | ||
324 | source "kernel/Kconfig.instrumentation" | ||
325 | |||
326 | source "arch/sparc/Kconfig.debug" | 324 | source "arch/sparc/Kconfig.debug" |
327 | 325 | ||
328 | source "security/Kconfig" | 326 | source "security/Kconfig" |
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index cbdc80d74bcb..a7739b507b74 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig | |||
@@ -467,8 +467,6 @@ source "drivers/sbus/char/Kconfig" | |||
467 | 467 | ||
468 | source "fs/Kconfig" | 468 | source "fs/Kconfig" |
469 | 469 | ||
470 | source "kernel/Kconfig.instrumentation" | ||
471 | |||
472 | source "arch/sparc64/Kconfig.debug" | 470 | source "arch/sparc64/Kconfig.debug" |
473 | 471 | ||
474 | source "security/Kconfig" | 472 | source "security/Kconfig" |
diff --git a/arch/um/Kconfig b/arch/um/Kconfig index dd1689b814cb..55945db1313c 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig | |||
@@ -289,6 +289,4 @@ config INPUT | |||
289 | bool | 289 | bool |
290 | default n | 290 | default n |
291 | 291 | ||
292 | source "kernel/Kconfig.instrumentation" | ||
293 | |||
294 | source "arch/um/Kconfig.debug" | 292 | source "arch/um/Kconfig.debug" |
diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig index b6a50b8b38de..ace479ab273f 100644 --- a/arch/v850/Kconfig +++ b/arch/v850/Kconfig | |||
@@ -331,8 +331,6 @@ source "sound/Kconfig" | |||
331 | 331 | ||
332 | source "drivers/usb/Kconfig" | 332 | source "drivers/usb/Kconfig" |
333 | 333 | ||
334 | source "kernel/Kconfig.instrumentation" | ||
335 | |||
336 | source "arch/v850/Kconfig.debug" | 334 | source "arch/v850/Kconfig.debug" |
337 | 335 | ||
338 | source "security/Kconfig" | 336 | source "security/Kconfig" |
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 72db31c78666..3162cb467ab3 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -1595,8 +1595,6 @@ source "drivers/firmware/Kconfig" | |||
1595 | 1595 | ||
1596 | source "fs/Kconfig" | 1596 | source "fs/Kconfig" |
1597 | 1597 | ||
1598 | source "kernel/Kconfig.instrumentation" | ||
1599 | |||
1600 | source "arch/x86/Kconfig.debug" | 1598 | source "arch/x86/Kconfig.debug" |
1601 | 1599 | ||
1602 | source "security/Kconfig" | 1600 | source "security/Kconfig" |
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index 844721e8e3dd..5d5546ce88fe 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig | |||
@@ -246,8 +246,6 @@ config EMBEDDED_RAMDISK_IMAGE | |||
246 | provide one yourself. | 246 | provide one yourself. |
247 | endmenu | 247 | endmenu |
248 | 248 | ||
249 | source "kernel/Kconfig.instrumentation" | ||
250 | |||
251 | source "arch/xtensa/Kconfig.debug" | 249 | source "arch/xtensa/Kconfig.debug" |
252 | 250 | ||
253 | source "security/Kconfig" | 251 | source "security/Kconfig" |