diff options
| author | Dave Airlie <airlied@gmail.com> | 2013-01-31 14:27:03 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2013-01-31 15:46:56 +1100 |
| commit | ff0d05bf73620eb7dc8aee7423e992ef87870bdf (patch) | |
| tree | c2a874bdaf2dc6487dae7be17790745ce29a8b9b /kernel | |
| parent | 2e51b231a8d716ea5aacde0bd95ac789cea195b0 (diff) | |
| download | talos-obmc-linux-ff0d05bf73620eb7dc8aee7423e992ef87870bdf.tar.gz talos-obmc-linux-ff0d05bf73620eb7dc8aee7423e992ef87870bdf.zip | |
Revert "console: implement lockdep support for console_lock"
This reverts commit daee779718a319ff9f83e1ba3339334ac650bb22.
I'll requeue this after the console locking fixes, so lockdep
is useful again for people until fbcon is fixed.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/printk.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 357f714ddd49..267ce780abe8 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -87,12 +87,6 @@ static DEFINE_SEMAPHORE(console_sem); struct console *console_drivers; EXPORT_SYMBOL_GPL(console_drivers); -#ifdef CONFIG_LOCKDEP -static struct lockdep_map console_lock_dep_map = { - .name = "console_lock" -}; -#endif - /* * This is used for debugging the mess that is the VT code by * keeping track if we have the console semaphore held. It's @@ -1924,7 +1918,6 @@ void console_lock(void) return; console_locked = 1; console_may_schedule = 1; - mutex_acquire(&console_lock_dep_map, 0, 0, _RET_IP_); } EXPORT_SYMBOL(console_lock); @@ -1946,7 +1939,6 @@ int console_trylock(void) } console_locked = 1; console_may_schedule = 0; - mutex_acquire(&console_lock_dep_map, 0, 1, _RET_IP_); return 1; } EXPORT_SYMBOL(console_trylock); @@ -2107,7 +2099,6 @@ skip: local_irq_restore(flags); } console_locked = 0; - mutex_release(&console_lock_dep_map, 1, _RET_IP_); /* Release the exclusive_console once it is used */ if (unlikely(exclusive_console)) |
