lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

Browse Source 
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  locking: clarify kernel-taint warning message
  lockdep, x86: account for irqs enabled in paranoid_exit
  lockdep: more robust lockdep_map init sequence
This commit is contained in:
Linus Torvalds
2009-04-26 10:29:01 -07:00
parent ce8a7424d2 b48ccb095a
commit 1e4b978154
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/kernel/entry_64.S
View File

@@ -1410,7 +1410,10 @@ ENTRY(paranoid_exit)
paranoid_swapgs: paranoid_swapgs:
TRACE_IRQS_IRETQ 0 TRACE_IRQS_IRETQ 0
SWAPGS_UNSAFE_STACK SWAPGS_UNSAFE_STACK
RESTORE_ALL 8
jmp irq_return
paranoid_restore: paranoid_restore:
TRACE_IRQS_IRETQ 0
RESTORE_ALL 8 RESTORE_ALL 8
jmp irq_return jmp irq_return
paranoid_userspace: paranoid_userspace:

22
kernel/lockdep.c
View File

@@ -2490,13 +2490,20 @@ static int mark_lock(struct task_struct *curr, struct held_lock *this,
void lockdep_init_map(struct lockdep_map *lock, const char *name, void lockdep_init_map(struct lockdep_map *lock, const char *name,
struct lock_class_key *key, int subclass) struct lock_class_key *key, int subclass)
{ {
if (unlikely(!debug_locks)) lock->class_cache = NULL;
#ifdef CONFIG_LOCK_STAT
lock->cpu = raw_smp_processor_id();
#endif
if (DEBUG_LOCKS_WARN_ON(!name)) {
lock->name = "NULL";
return; return;
}
lock->name = name;
if (DEBUG_LOCKS_WARN_ON(!key)) if (DEBUG_LOCKS_WARN_ON(!key))
return; return;
if (DEBUG_LOCKS_WARN_ON(!name))
return;
/* /*
* Sanity check, the lock-class key must be persistent: * Sanity check, the lock-class key must be persistent:
*/ */
@@ -2505,12 +2512,11 @@ void lockdep_init_map(struct lockdep_map *lock, const char *name,
DEBUG_LOCKS_WARN_ON(1); DEBUG_LOCKS_WARN_ON(1);
return; return;
} }
lock->name = name;
lock->key = key; lock->key = key;
lock->class_cache = NULL;
#ifdef CONFIG_LOCK_STAT if (unlikely(!debug_locks))
lock->cpu = raw_smp_processor_id(); return;
#endif
if (subclass) if (subclass)
register_lock_class(lock, subclass, 1); register_lock_class(lock, subclass, 1);
} }

2
kernel/panic.c
View File

@@ -221,7 +221,7 @@ void add_taint(unsigned flag)
* post-warning case. * post-warning case.
*/ */
if (flag != TAINT_CRAP && flag != TAINT_WARN && __debug_locks_off()) if (flag != TAINT_CRAP && flag != TAINT_WARN && __debug_locks_off())
printk(KERN_WARNING "Disabling lockdep due to kernel taint\n"); printk(KERN_WARNING "Disabling lock debugging due to kernel taint\n");
set_bit(flag, &tainted_mask); set_bit(flag, &tainted_mask);
} }