Commit bcb38ceb authored by Dave Airlie's avatar Dave Airlie Committed by Linus Torvalds

Revert "debug_locks: set oops_in_progress if we will log messages."

This reverts commit e0fdace1.

On-list discussion seems to suggest that the robustness fixes for printk
make this unnecessary and DaveM has also agreed in person at Kernel Summit
and on list.

The main problem with this code is once we hit a lockdep splat we always
keep oops_in_progress set, the console layer uses oops_in_progress with KMS
to decide when it should be showing the oops and not showing X, so it causes
problems around suspend/resume time when a userspace resume can cause a console
switch away from X, only if oops_in_progress is set (which is what we want
if an oops actually is in progress, but not because we had a lockdep splat
2 days prior).

Cc: David S Miller <>
Cc: Ingo Molnar <>
Signed-off-by: default avatarDave Airlie <>
Signed-off-by: default avatarLinus Torvalds <>
parent 8f1b1a50
......@@ -8,7 +8,6 @@
* Copyright (C) 2006 Red Hat, Inc., Ingo Molnar <>
#include <linux/kernel.h>
#include <linux/rwsem.h>
#include <linux/mutex.h>
#include <linux/module.h>
......@@ -39,7 +38,6 @@ int debug_locks_off(void)
if (__debug_locks_off()) {
if (!debug_locks_silent) {
oops_in_progress = 1;
return 1;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment