提交 ff0d05bf 编写于 作者: D Dave Airlie

Revert "console: implement lockdep support for console_lock"

This reverts commit daee7797.

I'll requeue this after the console locking fixes, so lockdep
is useful again for people until fbcon is fixed.
Signed-off-by: NDave Airlie <airlied@redhat.com>
上级 2e51b231
...@@ -87,12 +87,6 @@ static DEFINE_SEMAPHORE(console_sem); ...@@ -87,12 +87,6 @@ static DEFINE_SEMAPHORE(console_sem);
struct console *console_drivers; struct console *console_drivers;
EXPORT_SYMBOL_GPL(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 * This is used for debugging the mess that is the VT code by
* keeping track if we have the console semaphore held. It's * keeping track if we have the console semaphore held. It's
...@@ -1924,7 +1918,6 @@ void console_lock(void) ...@@ -1924,7 +1918,6 @@ void console_lock(void)
return; return;
console_locked = 1; console_locked = 1;
console_may_schedule = 1; console_may_schedule = 1;
mutex_acquire(&console_lock_dep_map, 0, 0, _RET_IP_);
} }
EXPORT_SYMBOL(console_lock); EXPORT_SYMBOL(console_lock);
...@@ -1946,7 +1939,6 @@ int console_trylock(void) ...@@ -1946,7 +1939,6 @@ int console_trylock(void)
} }
console_locked = 1; console_locked = 1;
console_may_schedule = 0; console_may_schedule = 0;
mutex_acquire(&console_lock_dep_map, 0, 1, _RET_IP_);
return 1; return 1;
} }
EXPORT_SYMBOL(console_trylock); EXPORT_SYMBOL(console_trylock);
...@@ -2107,7 +2099,6 @@ void console_unlock(void) ...@@ -2107,7 +2099,6 @@ void console_unlock(void)
local_irq_restore(flags); local_irq_restore(flags);
} }
console_locked = 0; console_locked = 0;
mutex_release(&console_lock_dep_map, 1, _RET_IP_);
/* Release the exclusive_console once it is used */ /* Release the exclusive_console once it is used */
if (unlikely(exclusive_console)) if (unlikely(exclusive_console))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册