diff --git a/[refs] b/[refs] index 408dd69bcc50..e0dffc7ae53a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9c0d2a20fe331946c1a65a5865faf56e93255c5c +refs/heads/master: 9e94cd325bb8ed8abe13f29b64fb54c1dec633a8 diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index b678803deccf..c11da38837e5 100644 --- a/trunk/init/Kconfig +++ b/trunk/init/Kconfig @@ -558,17 +558,6 @@ config SYSCTL_SYSCALL If unsure say Y here. -config SYSCTL_SYSCALL_CHECK - bool "Sysctl checks" if EMBEDDED - depends on SYSCTL_SYSCALL - default y - ---help--- - sys_sysctl uses binary paths that have been found challenging - to properly maintain and use. This enables checks that help - you to keep things correct. - - If unsure say Y here. - config KALLSYMS bool "Load all symbols for debugging/ksymoops" if EMBEDDED default y diff --git a/trunk/lib/Kconfig.debug b/trunk/lib/Kconfig.debug index 800ac8485544..8b5a7d304a5f 100644 --- a/trunk/lib/Kconfig.debug +++ b/trunk/lib/Kconfig.debug @@ -693,6 +693,14 @@ config LATENCYTOP Enable this option if you want to use the LatencyTOP tool to find out which userspace is blocking on what kernel operations. +config SYSCTL_SYSCALL_CHECK + bool "Sysctl checks" + depends on SYSCTL_SYSCALL + ---help--- + sys_sysctl uses binary paths that have been found challenging + to properly maintain and use. This enables checks that help + you to keep things correct. + source kernel/trace/Kconfig config PROVIDE_OHCI1394_DMA_INIT