mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 15:18:19 +00:00
Revert "console: implement lockdep support for console_lock"
This reverts commit daee779718
.
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>
This commit is contained in:
parent
2e51b231a8
commit
ff0d05bf73
1 changed files with 0 additions and 9 deletions
|
@ -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)
|
||||||
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)
|
||||||
}
|
}
|
||||||
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)
|
||||||
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))
|
||||||
|
|
Loading…
Reference in a new issue