]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit - lib/Kconfig.debug
sparc64: Use LOCKDEP_SMALL, not PROVE_LOCKING_SMALL
authorDaniel Jordan <daniel.m.jordan@oracle.com>
Mon, 10 Apr 2017 15:50:52 +0000 (11:50 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 18 Apr 2017 20:11:07 +0000 (13:11 -0700)
commit395102db441abb8fd18fec5dd81428b5120232af
treebcb11efdbc770a327a54259882a776f2a064cd3d
parentfb5e2154b764812705dce84881319471d27606fb
sparc64: Use LOCKDEP_SMALL, not PROVE_LOCKING_SMALL

CONFIG_PROVE_LOCKING_SMALL shrinks the memory usage of lockdep so the
kernel text, data, and bss fit in the required 32MB limit, but this
option is not set for every config that enables lockdep.

A 4.10 kernel fails to boot with the console output

    Kernel: Using 8 locked TLB entries for main kernel image.
    hypervisor_tlb_lock[2000000:0:8000000071c007c3:1]: errors with f
    Program terminated

with these config options

    CONFIG_LOCKDEP=y
    CONFIG_LOCK_STAT=y
    CONFIG_PROVE_LOCKING=n

To fix, rename CONFIG_PROVE_LOCKING_SMALL to CONFIG_LOCKDEP_SMALL, and
enable this option with CONFIG_LOCKDEP=y so we get the reduced memory
usage every time lockdep is turned on.

Tested that CONFIG_LOCKDEP_SMALL is set to 'y' if and only if
CONFIG_LOCKDEP is set to 'y'.  When other lockdep-related config options
that select CONFIG_LOCKDEP are enabled (e.g. CONFIG_LOCK_STAT or
CONFIG_PROVE_LOCKING), verified that CONFIG_LOCKDEP_SMALL is also
enabled.

Fixes: e6b5f1be7afe ("config: Adding the new config parameter CONFIG_PROVE_LOCKING_SMALL for sparc")
Signed-off-by: Daniel Jordan <daniel.m.jordan@oracle.com>
Reviewed-by: Babu Moger <babu.moger@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
arch/sparc/Kconfig
kernel/locking/lockdep_internals.h
lib/Kconfig.debug