projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...
[profile/ivi/kernel-x86-ivi.git]
/
lib
/
debug_locks.c
diff --git
a/lib/debug_locks.c
b/lib/debug_locks.c
index
0ef01d1
..
0218b46
100644
(file)
--- a/
lib/debug_locks.c
+++ b/
lib/debug_locks.c
@@
-8,6
+8,7
@@
*
* Copyright (C) 2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com>
*/
*
* Copyright (C) 2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com>
*/
+#include <linux/kernel.h>
#include <linux/rwsem.h>
#include <linux/mutex.h>
#include <linux/module.h>
#include <linux/rwsem.h>
#include <linux/mutex.h>
#include <linux/module.h>
@@
-37,6
+38,7
@@
int debug_locks_off(void)
{
if (xchg(&debug_locks, 0)) {
if (!debug_locks_silent) {
{
if (xchg(&debug_locks, 0)) {
if (!debug_locks_silent) {
+ oops_in_progress = 1;
console_verbose();
return 1;
}
console_verbose();
return 1;
}