This reverts commit daee779718a319ff9f83e1ba3339334ac650bb22. I'll requeue this after the console locking fixes, so lockdep is useful again for people until fbcon is fixed.
Unified · Split
| @@ -87,12 +87,6 @@ static DEFINE_SEMAPHORE(console_sem); · 86 unmodified lines | ||
| 87 | 87 | struct console *console_drivers; |
| 88 | 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 | 91 | * This is used for debugging the mess that is the VT code by |
| 98 | 92 | * keeping track if we have the console semaphore held. It's |
| @@ -1924,7 +1918,6 @@ void console_lock(void) · 1825 unmodified lines | ||
| 1924 | 1918 | return; |
| 1925 | 1919 | console_locked = 1; |
| 1926 | 1920 | console_may_schedule = 1; |
| 1927 | − mutex_acquire(&console_lock_dep_map, 0, 0, _RET_IP_); | |
| 1928 | 1921 | } |
| 1929 | 1922 | EXPORT_SYMBOL(console_lock); |
| 1930 | 1923 | |
| @@ -1946,7 +1939,6 @@ int console_trylock(void) · 15 unmodified lines | ||
| 1946 | 1939 | } |
| 1947 | 1940 | console_locked = 1; |
| 1948 | 1941 | console_may_schedule = 0; |
| 1949 | − mutex_acquire(&console_lock_dep_map, 0, 1, _RET_IP_); | |
| 1950 | 1942 | return 1; |
| 1951 | 1943 | } |
| 1952 | 1944 | EXPORT_SYMBOL(console_trylock); |
| @@ -2107,7 +2099,6 @@ skip: · 154 unmodified lines | ||
| 2107 | 2099 | local_irq_restore(flags); |
| 2108 | 2100 | } |
| 2109 | 2101 | console_locked = 0; |
| 2110 | − mutex_release(&console_lock_dep_map, 1, _RET_IP_); | |
| 2111 | 2102 | |
| 2112 | 2103 | /* Release the exclusive_console once it is used */ |
| 2113 | 2104 | if (unlikely(exclusive_console)) |