diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-12-30 00:20:30 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-12-30 00:21:47 -0500 |
| commit | d392da5207352f09030e95d9ea335a4225667ec0 (patch) | |
| tree | 7d6cd1932afcad0a5619a5c504a6d93ca318187c /lib/debug_locks.c | |
| parent | e39d5ef678045d61812c1401f04fe8edb14d6359 (diff) | |
| parent | 387c31c7e5c9805b0aef8833d1731a5fe7bdea14 (diff) | |
Merge v2.6.37-rc8 into powerpc/next
Diffstat (limited to 'lib/debug_locks.c')
| -rw-r--r-- | lib/debug_locks.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/debug_locks.c b/lib/debug_locks.c index 5bf0020b9248..b1c177307677 100644 --- a/lib/debug_locks.c +++ b/lib/debug_locks.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * | 8 | * |
| 9 | * Copyright (C) 2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com> | 9 | * Copyright (C) 2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com> |
| 10 | */ | 10 | */ |
| 11 | #include <linux/kernel.h> | ||
| 12 | #include <linux/rwsem.h> | 11 | #include <linux/rwsem.h> |
| 13 | #include <linux/mutex.h> | 12 | #include <linux/mutex.h> |
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| @@ -39,7 +38,6 @@ int debug_locks_off(void) | |||
| 39 | { | 38 | { |
| 40 | if (__debug_locks_off()) { | 39 | if (__debug_locks_off()) { |
| 41 | if (!debug_locks_silent) { | 40 | if (!debug_locks_silent) { |
| 42 | oops_in_progress = 1; | ||
| 43 | console_verbose(); | 41 | console_verbose(); |
| 44 | return 1; | 42 | return 1; |
| 45 | } | 43 | } |