Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 125e564582cbce6219397fc64556438420efae4c

Authored by Mathieu Desnoyers
Committed by Sam Ravnborg
1 parent 3f550096de
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig 

Move the instrumentation Kconfig to

arch/Kconfig for architecture dependent options
  - oprofile
  - kprobes

and

init/Kconfig for architecture independent options
  - profiling
  - markers

Remove the "Instrumentation Support" menu. Everything moves to "General setup".
Delete the kernel/Kconfig.instrumentation file.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Showing 25 changed files with 40 additions and 99 deletions Side-by-side Diff

1 1 #
2 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
... ... @@ -650,8 +650,6 @@
650 650  
651 651 source "fs/Kconfig"
652 652  
653   -source "kernel/Kconfig.instrumentation"
654   -
655 653 source "arch/alpha/Kconfig.debug"
656 654  
657 655 # DUMMY_CONSOLE may be defined in drivers/video/console/Kconfig
... ... @@ -1147,8 +1147,6 @@
1147 1147  
1148 1148 source "fs/Kconfig"
1149 1149  
1150   -source "kernel/Kconfig.instrumentation"
1151   -
1152 1150 source "arch/arm/Kconfig.debug"
1153 1151  
1154 1152 source "security/Kconfig"
arch/blackfin/Kconfig
Diff comments   View file @ 125e564
... ... @@ -974,8 +974,6 @@
974 974  
975 975 source "fs/Kconfig"
976 976  
977   -source "kernel/Kconfig.instrumentation"
978   -
979 977 source "arch/blackfin/Kconfig.debug"
980 978  
981 979 source "security/Kconfig"
... ... @@ -213,8 +213,6 @@
213 213  
214 214 source "drivers/usb/Kconfig"
215 215  
216   -source "kernel/Kconfig.instrumentation"
217   -
218 216 source "arch/cris/Kconfig.debug"
219 217  
220 218 source "security/Kconfig"
... ... @@ -375,8 +375,6 @@
375 375  
376 376 source "fs/Kconfig"
377 377  
378   -source "kernel/Kconfig.instrumentation"
379   -
380 378 source "arch/frv/Kconfig.debug"
381 379  
382 380 source "security/Kconfig"
... ... @@ -223,8 +223,6 @@
223 223  
224 224 source "fs/Kconfig"
225 225  
226   -source "kernel/Kconfig.instrumentation"
227   -
228 226 source "arch/h8300/Kconfig.debug"
229 227  
230 228 source "security/Kconfig"
... ... @@ -602,8 +602,6 @@
602 602  
603 603 source "arch/ia64/hp/sim/Kconfig"
604 604  
605   -source "kernel/Kconfig.instrumentation"
606   -
607 605 source "arch/ia64/Kconfig.debug"
608 606  
609 607 source "security/Kconfig"
... ... @@ -427,8 +427,6 @@
427 427  
428 428 source "fs/Kconfig"
429 429  
430   -source "kernel/Kconfig.instrumentation"
431   -
432 430 source "arch/m32r/Kconfig.debug"
433 431  
434 432 source "security/Kconfig"
... ... @@ -678,8 +678,6 @@
678 678  
679 679 source "fs/Kconfig"
680 680  
681   -source "kernel/Kconfig.instrumentation"
682   -
683 681 source "arch/m68k/Kconfig.debug"
684 682  
685 683 source "security/Kconfig"
arch/m68knommu/Kconfig
Diff comments   View file @ 125e564
... ... @@ -711,8 +711,6 @@
711 711  
712 712 source "fs/Kconfig"
713 713  
714   -source "kernel/Kconfig.instrumentation"
715   -
716 714 source "arch/m68knommu/Kconfig.debug"
717 715  
718 716 source "security/Kconfig"
... ... @@ -2096,8 +2096,6 @@
2096 2096  
2097 2097 source "fs/Kconfig"
2098 2098  
2099   -source "kernel/Kconfig.instrumentation"
2100   -
2101 2099 source "arch/mips/Kconfig.debug"
2102 2100  
2103 2101 source "security/Kconfig"
... ... @@ -273,8 +273,6 @@
273 273  
274 274 source "fs/Kconfig"
275 275  
276   -source "kernel/Kconfig.instrumentation"
277   -
278 276 source "arch/parisc/Kconfig.debug"
279 277  
280 278 source "security/Kconfig"
arch/powerpc/Kconfig
Diff comments   View file @ 125e564
... ... @@ -715,8 +715,6 @@
715 715  
716 716 source "lib/Kconfig"
717 717  
718   -source "kernel/Kconfig.instrumentation"
719   -
720 718 source "arch/powerpc/Kconfig.debug"
721 719  
722 720 source "security/Kconfig"
... ... @@ -1258,8 +1258,6 @@
1258 1258  
1259 1259 source "lib/Kconfig"
1260 1260  
1261   -source "kernel/Kconfig.instrumentation"
1262   -
1263 1261 source "arch/ppc/Kconfig.debug"
1264 1262  
1265 1263 source "security/Kconfig"
... ... @@ -528,8 +528,6 @@
528 528  
529 529 source "fs/Kconfig"
530 530  
531   -source "kernel/Kconfig.instrumentation"
532   -
533 531 source "arch/s390/Kconfig.debug"
534 532  
535 533 source "security/Kconfig"
... ... @@ -897,8 +897,6 @@
897 897  
898 898 source "fs/Kconfig"
899 899  
900   -source "kernel/Kconfig.instrumentation"
901   -
902 900 source "arch/sh/Kconfig.debug"
903 901  
904 902 source "security/Kconfig"
... ... @@ -321,8 +321,6 @@
321 321  
322 322 source "fs/Kconfig"
323 323  
324   -source "kernel/Kconfig.instrumentation"
325   -
326 324 source "arch/sparc/Kconfig.debug"
327 325  
328 326 source "security/Kconfig"
arch/sparc64/Kconfig
Diff comments   View file @ 125e564
... ... @@ -467,8 +467,6 @@
467 467  
468 468 source "fs/Kconfig"
469 469  
470   -source "kernel/Kconfig.instrumentation"
471   -
472 470 source "arch/sparc64/Kconfig.debug"
473 471  
474 472 source "security/Kconfig"
... ... @@ -289,7 +289,5 @@
289 289 bool
290 290 default n
291 291  
292   -source "kernel/Kconfig.instrumentation"
293   -
294 292 source "arch/um/Kconfig.debug"
... ... @@ -331,8 +331,6 @@
331 331  
332 332 source "drivers/usb/Kconfig"
333 333  
334   -source "kernel/Kconfig.instrumentation"
335   -
336 334 source "arch/v850/Kconfig.debug"
337 335  
338 336 source "security/Kconfig"
... ... @@ -1595,8 +1595,6 @@
1595 1595  
1596 1596 source "fs/Kconfig"
1597 1597  
1598   -source "kernel/Kconfig.instrumentation"
1599   -
1600 1598 source "arch/x86/Kconfig.debug"
1601 1599  
1602 1600 source "security/Kconfig"
... ... @@ -246,8 +246,6 @@
246 246 provide one yourself.
247 247 endmenu
248 248  
249   -source "kernel/Kconfig.instrumentation"
250   -
251 249 source "arch/xtensa/Kconfig.debug"
252 250  
253 251 source "security/Kconfig"
... ... @@ -665,6 +665,18 @@
665 665  
666 666 endchoice
667 667  
  668 +config PROFILING
  669 + bool "Profiling support (EXPERIMENTAL)"
  670 + help
  671 + Say Y here to enable the extended profiling support mechanisms used
  672 + by profilers such as OProfile.
  673 +
  674 +config MARKERS
  675 + bool "Activate markers"
  676 + help
  677 + Place an empty function call at each marker site. Can be
  678 + dynamically changed for a probe function.
  679 +
668 680 source "arch/Kconfig"
669 681  
670 682 endmenu # General setup
kernel/Kconfig.instrumentation
View file @ 125e564
1   -menuconfig INSTRUMENTATION
2   - bool "Instrumentation Support"
3   - default y
4   - ---help---
5   - Say Y here to get to see options related to performance measurement,
6   - system-wide debugging, and testing. This option alone does not add any
7   - kernel code.
8   -
9   - If you say N, all options in this submenu will be skipped and
10   - disabled. If you're trying to debug the kernel itself, go see the
11   - Kernel Hacking menu.
12   -
13   -if INSTRUMENTATION
14   -
15   -config PROFILING
16   - bool "Profiling support (EXPERIMENTAL)"
17   - help
18   - Say Y here to enable the extended profiling support mechanisms used
19   - by profilers such as OProfile.
20   -
21   -config OPROFILE
22   - tristate "OProfile system profiling (EXPERIMENTAL)"
23   - depends on PROFILING && !UML
24   - depends on HAVE_OPROFILE
25   - help
26   - OProfile is a profiling system capable of profiling the
27   - whole system, include the kernel, kernel modules, libraries,
28   - and applications.
29   -
30   - If unsure, say N.
31   -
32   -config HAVE_OPROFILE
33   - def_bool n
34   -
35   -config KPROBES
36   - bool "Kprobes"
37   - depends on KALLSYMS && MODULES && !UML
38   - depends on HAVE_KPROBES
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 HAVE_KPROBES
47   - def_bool n
48   -
49   -config MARKERS
50   - bool "Activate markers"
51   - help
52   - Place an empty function call at each marker site. Can be
53   - dynamically changed for a probe function.
54   -
55   -endif # INSTRUMENTATION