Commit 519cb688 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild 

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
  scsi: fix dependency bug in aic7 Makefile
  kbuild: add svn revision information to setlocalversion
  kbuild: do not warn about __*init/__*exit symbols being exported
  Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig
  Add HAVE_KPROBES
  Add HAVE_OPROFILE
  Create arch/Kconfig
  Fix ARM to play nicely with generic Instrumentation menu
  kconfig: ignore select of unknown symbol
  kconfig: mark config as changed when loading an alternate config
  kbuild: Spelling/grammar fixes for config DEBUG_SECTION_MISMATCH
  Remove __INIT_REFOK and __INITDATA_REFOK
  kbuild: print only total number of section mismatces found
parents 2f98735c 8891fec6

kernel/Kconfig.instrumentation→arch/Kconfig

+31 −0
Original line number Diff line number Diff line 
menuconfig INSTRUMENTATION

	bool "Instrumentation Support"

	default y

	---help---

	  Say Y here to get to see options related to performance measurement,

	  system-wide debugging, and testing. This option alone does not add any

	  kernel code.



	  If you say N, all options in this submenu will be skipped and

	  disabled. If you're trying to debug the kernel itself, go see the

	  Kernel Hacking menu.



if INSTRUMENTATION



config PROFILING

	bool "Profiling support (EXPERIMENTAL)"

	help

	  Say Y here to enable the extended profiling support mechanisms used

	  by profilers such as OProfile.

#

# General architecture dependent options

#



config OPROFILE

	tristate "OProfile system profiling (EXPERIMENTAL)"

	depends on PROFILING && !UML

	depends on ARCH_SUPPORTS_OPROFILE || ALPHA || ARM || BLACKFIN || IA64 || M32R || PARISC || PPC || S390 || SUPERH || SPARC

	depends on PROFILING

	depends on HAVE_OPROFILE

	help

	  OProfile is a profiling system capable of profiling the

	  whole system, include the kernel, kernel modules, libraries,
@@ -29,10 +13,13 @@ config OPROFILE 


	  If unsure, say N.



config HAVE_OPROFILE

	def_bool n



config KPROBES

	bool "Kprobes"

	depends on KALLSYMS && MODULES && !UML

	depends on X86_32 || IA64 || PPC || S390 || SPARC64 || X86_64 || AVR32

	depends on KALLSYMS && MODULES

	depends on HAVE_KPROBES

	help

	  Kprobes allows you to trap at almost any kernel address and

	  execute a callback function.  register_kprobe() establishes
@@ -40,10 +27,5 @@ config KPROBES 
	  for kernel debugging, non-intrusive instrumentation and testing.

	  If in doubt, say "N".



config MARKERS

	bool "Activate markers"

	help

	  Place an empty function call at each marker site. Can be

	  dynamically changed for a probe function.



endif # INSTRUMENTATION
 
config HAVE_KPROBES

	def_bool n

arch/alpha/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
config ALPHA

	bool

	default y

	select HAVE_OPROFILE

	help

	  The Alpha is a 64-bit general-purpose processor designed and

	  marketed by the Digital Equipment Corporation of blessed memory,
@@ -649,8 +650,6 @@ source "drivers/Kconfig" 


source "fs/Kconfig"



source "kernel/Kconfig.instrumentation"



source "arch/alpha/Kconfig.debug"



# DUMMY_CONSOLE may be defined in drivers/video/console/Kconfig

arch/arm/Kconfig

+19 −2
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ config ARM 
	default y

	select RTC_LIB

	select SYS_SUPPORTS_APM_EMULATION

	select HAVE_OPROFILE

	select HAVE_KPROBES if (!XIP_KERNEL)

	help

	  The ARM series is a line of low-power-consumption RISC chip designs

	  licensed by ARM Ltd and targeted at embedded applications and
@@ -135,6 +137,23 @@ config FIQ 
config ARCH_MTD_XIP

	bool



if OPROFILE



config OPROFILE_ARMV6

	def_bool y

	depends on CPU_V6 && !SMP

	select OPROFILE_ARM11_CORE



config OPROFILE_MPCORE

	def_bool y

	depends on CPU_V6 && SMP

	select OPROFILE_ARM11_CORE



config OPROFILE_ARM11_CORE

	bool



endif



config VECTORS_BASE

	hex

	default 0xffff0000 if MMU || CPU_HIGH_VECTOR
@@ -1128,8 +1147,6 @@ endmenu 


source "fs/Kconfig"



source "arch/arm/Kconfig.instrumentation"



source "arch/arm/Kconfig.debug"



source "security/Kconfig"

arch/arm/Kconfig.instrumentation

deleted100644 → 0
+0 −62
Original line number Diff line number Diff line 
menuconfig INSTRUMENTATION

	bool "Instrumentation Support"

	default y

	---help---

	  Say Y here to get to see options related to performance measurement,

	  system-wide debugging, and testing. This option alone does not add any

	  kernel code.



	  If you say N, all options in this submenu will be skipped and

	  disabled. If you're trying to debug the kernel itself, go see the

	  Kernel Hacking menu.



if INSTRUMENTATION



config PROFILING

	bool "Profiling support (EXPERIMENTAL)"

	help

	  Say Y here to enable the extended profiling support mechanisms used

	  by profilers such as OProfile.



config OPROFILE

	tristate "OProfile system profiling (EXPERIMENTAL)"

	depends on PROFILING && !UML

	help

	  OProfile is a profiling system capable of profiling the

	  whole system, include the kernel, kernel modules, libraries,

	  and applications.



	  If unsure, say N.



config OPROFILE_ARMV6

	bool

	depends on OPROFILE && CPU_V6 && !SMP

	default y

	select OPROFILE_ARM11_CORE



config OPROFILE_MPCORE

	bool

	depends on OPROFILE && CPU_V6 && SMP

	default y

	select OPROFILE_ARM11_CORE



config OPROFILE_ARM11_CORE

	bool



config KPROBES

	bool "Kprobes"

	depends on KALLSYMS && MODULES && !UML && !XIP_KERNEL

	help

	  Kprobes allows you to trap at almost any kernel address and

	  execute a callback function.  register_kprobe() establishes

	  a probepoint and specifies the callback.  Kprobes is useful

	  for kernel debugging, non-intrusive instrumentation and testing.

	  If in doubt, say "N".



config MARKERS

	bool "Activate markers"

	help

	  Place an empty function call at each marker site. Can be

	  dynamically changed for a probe function.



endif # INSTRUMENTATION

arch/avr32/Kconfig

+2 −3
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ config AVR32 
	# With EMBEDDED=n, we get lots of stuff automatically selected

	# that we usually don't need on AVR32.

	select EMBEDDED

	select HAVE_OPROFILE

	select HAVE_KPROBES

	help

	  AVR32 is a high-performance 32-bit RISC microprocessor core,

	  designed for cost-sensitive embedded applications, with particular
@@ -54,9 +56,6 @@ config ARCH_HAS_ILOG2_U32 
config ARCH_HAS_ILOG2_U64

	def_bool n



config ARCH_SUPPORTS_OPROFILE

	def_bool y



config GENERIC_HWEIGHT

	def_bool y

CRA Git | Maintained and supported by SUSTech CRA and CCSE