Messages in this thread Patch in this message | | | From | Waiman Long <> | Subject | [PATCH v3 1/3] locking/spinlock: Disable GENERIC_LOCKBREAK when DEBUG_LOCK_ALLOC is on | Date | Thu, 2 Feb 2017 09:15:27 -0500 |
| |
The break_lock variable defined when GENERIC_LOCKBREAK is on is used only in kernel/locking/spinlock.c when
defined(CONFIG_GENERIC_LOCKBREAK) && !defined(CONFIG_DEBUG_LOCK_ALLOC).
As a result, there is no point in enabling GENERIC_LOCKBREAK to define one more variable in the spinlock structure that is not going to be used when DEBUG_LOCK_ALLOC is also on. This patch disables GENERIC_LOCKBREAK under this circumstance.
Signed-off-by: Waiman Long <longman@redhat.com> --- arch/m32r/Kconfig | 2 +- arch/parisc/Kconfig | 2 +- arch/powerpc/Kconfig | 2 +- arch/s390/Kconfig | 2 +- arch/sh/Kconfig | 2 +- arch/sparc/Kconfig | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index d227a69..c0922e0 100644 --- a/arch/m32r/Kconfig +++ b/arch/m32r/Kconfig @@ -242,7 +242,7 @@ config IRAM_SIZE config GENERIC_LOCKBREAK bool default y - depends on SMP && PREEMPT + depends on SMP && PREEMPT && !DEBUG_LOCK_ALLOC config RWSEM_GENERIC_SPINLOCK bool diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index 3a71f38..bd8dbb9 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig @@ -56,7 +56,7 @@ config STACK_GROWSUP config GENERIC_LOCKBREAK bool default y - depends on SMP && PREEMPT + depends on SMP && PREEMPT && !DEBUG_LOCK_ALLOC config RWSEM_GENERIC_SPINLOCK def_bool y diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index a8ee573..feae0a3 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -60,7 +60,7 @@ config RWSEM_XCHGADD_ALGORITHM config GENERIC_LOCKBREAK bool default y - depends on SMP && PREEMPT + depends on SMP && PREEMPT && !DEBUG_LOCK_ALLOC config ARCH_HAS_ILOG2_U32 bool diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index c6722112..a2a33a6 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -38,7 +38,7 @@ config ARCH_DMA_ADDR_T_64BIT def_bool y config GENERIC_LOCKBREAK - def_bool y if SMP && PREEMPT + def_bool y if SMP && PREEMPT && !DEBUG_LOCK_ALLOC config PGSTE def_bool y if KVM diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index ee08695..e2eb35c 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -105,7 +105,7 @@ config GENERIC_CALIBRATE_DELAY config GENERIC_LOCKBREAK def_bool y - depends on SMP && PREEMPT + depends on SMP && PREEMPT && !DEBUG_LOCK_ALLOC config ARCH_SUSPEND_POSSIBLE def_bool n diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index cf4034c..695a31a 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -286,7 +286,7 @@ config US3_MC config GENERIC_LOCKBREAK bool default y - depends on SPARC64 && SMP && PREEMPT + depends on SPARC64 && SMP && PREEMPT && !DEBUG_LOCK_ALLOC config NUMA bool "NUMA support" -- 1.8.3.1
| |