diff options
author | Dave Airlie <airlied@gmail.com> | 2013-01-30 22:27:03 -0500 |
---|---|---|
committer | Dave Airlie <airlied@gmail.com> | 2013-01-30 23:46:56 -0500 |
commit | ff0d05bf73620eb7dc8aee7423e992ef87870bdf (patch) | |
tree | c2a874bdaf2dc6487dae7be17790745ce29a8b9b /kernel/printk.c | |
parent | 2e51b231a8d716ea5aacde0bd95ac789cea195b0 (diff) |
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/printk.c')
-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); | |||
87 | struct console *console_drivers; | 87 | struct console *console_drivers; |
88 | EXPORT_SYMBOL_GPL(console_drivers); | 88 | EXPORT_SYMBOL_GPL(console_drivers); |
89 | 89 | ||
90 | #ifdef CONFIG_LOCKDEP | ||
91 | static struct lockdep_map console_lock_dep_map = { | ||
92 | .name = "console_lock" | ||
93 | }; | ||
94 | #endif | ||
95 | |||
96 | /* | 90 | /* |
97 | * This is used for debugging the mess that is the VT code by | 91 | * This is used for debugging the mess that is the VT code by |
98 | * keeping track if we have the console semaphore held. It's | 92 | * keeping track if we have the console semaphore held. It's |
@@ -1924,7 +1918,6 @@ void console_lock(void) | |||
1924 | return; | 1918 | return; |
1925 | console_locked = 1; | 1919 | console_locked = 1; |
1926 | console_may_schedule = 1; | 1920 | console_may_schedule = 1; |
1927 | mutex_acquire(&console_lock_dep_map, 0, 0, _RET_IP_); | ||
1928 | } | 1921 | } |
1929 | EXPORT_SYMBOL(console_lock); | 1922 | EXPORT_SYMBOL(console_lock); |
1930 | 1923 | ||
@@ -1946,7 +1939,6 @@ int console_trylock(void) | |||
1946 | } | 1939 | } |
1947 | console_locked = 1; | 1940 | console_locked = 1; |
1948 | console_may_schedule = 0; | 1941 | console_may_schedule = 0; |
1949 | mutex_acquire(&console_lock_dep_map, 0, 1, _RET_IP_); | ||
1950 | return 1; | 1942 | return 1; |
1951 | } | 1943 | } |
1952 | EXPORT_SYMBOL(console_trylock); | 1944 | EXPORT_SYMBOL(console_trylock); |
@@ -2107,7 +2099,6 @@ skip: | |||
2107 | local_irq_restore(flags); | 2099 | local_irq_restore(flags); |
2108 | } | 2100 | } |
2109 | console_locked = 0; | 2101 | console_locked = 0; |
2110 | mutex_release(&console_lock_dep_map, 1, _RET_IP_); | ||
2111 | 2102 | ||
2112 | /* Release the exclusive_console once it is used */ | 2103 | /* Release the exclusive_console once it is used */ |
2113 | if (unlikely(exclusive_console)) | 2104 | if (unlikely(exclusive_console)) |