diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-20 10:35:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-20 10:35:33 -0400 |
| commit | 7b9f6da175f9387ebfc202f35e0d39514899ab19 (patch) | |
| tree | a884c05aaeff40d8f80831549cccc820dcdd0f4f /lib | |
| parent | 9868879f293c599ce13b584c5bd8800312970781 (diff) | |
| parent | 1debdc8f9ebd07daf140e417b3841596911e0066 (diff) | |
| download | linux-0-day-7b9f6da175f9387ebfc202f35e0d39514899ab19.tar.gz linux-0-day-7b9f6da175f9387ebfc202f35e0d39514899ab19.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
A function in kernel/bpf/syscall.c which got a bug fix in 'net'
was moved to kernel/bpf/verifier.c in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig.debug | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 97d62c2da6c25..fa16c0f82d6e4 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -1103,9 +1103,6 @@ config PROVE_LOCKING For more details, see Documentation/locking/lockdep-design.txt. -config PROVE_LOCKING_SMALL - bool - config LOCKDEP bool depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT @@ -1114,6 +1111,9 @@ config LOCKDEP select KALLSYMS select KALLSYMS_ALL +config LOCKDEP_SMALL + bool + config LOCK_STAT bool "Lock usage statistics" depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT |