core fixes
Linus,
Please pull the latest core-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core-fixes-for-linus
The two lockdep fixes are not regression fixes but fixes for two recently discovered problems that artificially narrowed lockdep coverage for a class of drivers and a class of bootups (-with-warnings).
Thanks,
Ingo
------------------>
Frederic Weisbecker (2):
lockdep: warn about lockdep disabling after kernel taint
lockdep: continue lock debugging despite some taints
Heiko Carstens (1):
mutex: have non-spinning mutexes on s390 by default
Tejun Heo (1):
percpu: unbreak alpha percpu
arch/Kconfig | 3 ++ arch/s390/Kconfig | 1 + include/asm-generic/percpu.h | 52 ------------------------------------------ include/linux/debug_locks.h | 7 +++++ include/linux/percpu.h | 52 ++++++++++++++++++++++++++++++++++++++++++ kernel/mutex.c | 3 +- kernel/panic.c | 12 ++++++++- lib/debug_locks.c | 2 +- 8 files changed, 76 insertions(+), 56 deletions(-)
arch/Kconfig +3 -0
@@ -109,3 +109,6 @@ config HAVE_CLK config HAVE_DMA_API_DEBUG bool + +config HAVE_DEFAULT_NO_SPIN_MUTEXES + bool
arch/s390/Kconfig +1 -0
@@ -82,6 +82,7 @@ config S390 select USE_GENERIC_SMP_HELPERS if SMP select HAVE_SYSCALL_WRAPPERS select HAVE_FUNCTION_TRACER + select HAVE_DEFAULT_NO_SPIN_MUTEXES select HAVE_OPROFILE select HAVE_KPROBES select HAVE_KRETPROBES
include/asm-generic/percpu.h +0 -52
56 lines not on this page · raw message
include/linux/debug_locks.h +7 -0
@@ -2,12 +2,19 @@#define __LINUX_DEBUG_LOCKING_H#include <linux/kernel.h> +#include <asm/atomic.h> struct task_struct ;extern int debug_locks;extern int debug_locks_silent; + +static inline int __debug_locks_off (void ) +{ +return xchg (&debug_locks,0 ); +} +/* * Generic 'turn off all lock debugging' function: */
include/linux/percpu.h +52 -0
56 lines not on this page · raw message
kernel/mutex.c +2 -1
@@ -148,7 +148,8 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,preempt_disable ();mutex_acquire (&lock->dep_map, subclass,0 , ip); -#if defined(CONFIG_SMP ) && !defined(CONFIG_DEBUG_MUTEXES ) +#if defined(CONFIG_SMP ) && !defined(CONFIG_DEBUG_MUTEXES ) && \ + !defined(CONFIG_HAVE_DEFAULT_NO_SPIN_MUTEXES )/* * Optimistic spinning. *
kernel/panic.c +10 -2
@@ -213,8 +213,16 @@ unsigned long get_taint(void)void add_taint (unsigned flag) { -/* can't trust the integrity of the kernel anymore: */ - debug_locks =0 ; +/* +* Can't trust the integrity of the kernel anymore. +* We don't call directly debug_locks_off() because the issue +* is not necessarily serious enough to set oops_in_progress to 1 +* Also we want to keep up lockdep for staging development and +* post-warning case. +*/ +if (flag !=TAINT_CRAP && flag !=TAINT_WARN &&__debug_locks_off ()) +printk (KERN_WARNING "Disabling lockdep due to kernel taint\n" ); +set_bit (flag, &tainted_mask); }EXPORT_SYMBOL (add_taint);
lib/debug_locks.c +1 -1
@@ -36,7 +36,7 @@ int debug_locks_silent;*/ int debug_locks_off (void ) { -if (xchg (&debug_locks,0 )) { +if (__debug_locks_off ()) {if (!debug_locks_silent) { oops_in_progress =1 ;console_verbose ();