提交 7da4b8b7 编写于 作者: P Peter Hurley 提交者: Greg Kroah-Hartman

serial: core: Fix port mutex assert if lockdep disabled

commit 4047b371 ("serial: core: Prevent unsafe uart port access,
part 1") added lockdep assertion for port mutex but fails to check
if debug_locks has disabled lockdep (so lock state is no longer
reliable).

Use lockdep_assert_held() instead, which properly checks lockdep
state as well.
Reported-by: NTony Lindgren <tony@atomide.com>
Signed-off-by: NPeter Hurley <peter@hurleysoftware.com>
Tested-by: NTony Lindgren <tony@atomide.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 6550be9f
......@@ -95,9 +95,7 @@ static inline void uart_port_deref(struct uart_port *uport)
static inline struct uart_port *uart_port_check(struct uart_state *state)
{
#ifdef CONFIG_LOCKDEP
WARN_ON(!lockdep_is_held(&state->port.mutex));
#endif
lockdep_assert_held(&state->port.mutex);
return state->uart_port;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册