tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Dave Airlie ff0d05bf 2e51b231

-9
unified split
-9
kernel/printk.c
··· 87 struct console *console_drivers; 88 EXPORT_SYMBOL_GPL(console_drivers); 89 90 - #ifdef CONFIG_LOCKDEP 91 - static struct lockdep_map console_lock_dep_map = { 92 - .name = "console_lock" 93 - }; 94 - #endif 95 - 96 /* 97 * 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 ··· 1918 return; 1919 console_locked = 1; 1920 console_may_schedule = 1; 1921 - mutex_acquire(&console_lock_dep_map, 0, 0, _RET_IP_); 1922 } 1923 EXPORT_SYMBOL(console_lock); 1924 ··· 1939 } 1940 console_locked = 1; 1941 console_may_schedule = 0; 1942 - mutex_acquire(&console_lock_dep_map, 0, 1, _RET_IP_); 1943 return 1; 1944 } 1945 EXPORT_SYMBOL(console_trylock); ··· 2099 local_irq_restore(flags); 2100 } 2101 console_locked = 0; 2102 - mutex_release(&console_lock_dep_map, 1, _RET_IP_); 2103 2104 /* Release the exclusive_console once it is used */ 2105 if (unlikely(exclusive_console))
··· 87 struct console *console_drivers; 88 EXPORT_SYMBOL_GPL(console_drivers); 89 90 /* 91 * This is used for debugging the mess that is the VT code by 92 * keeping track if we have the console semaphore held. It's ··· 1924 return; 1925 console_locked = 1; 1926 console_may_schedule = 1; 1927 } 1928 EXPORT_SYMBOL(console_lock); 1929 ··· 1946 } 1947 console_locked = 1; 1948 console_may_schedule = 0; 1949 return 1; 1950 } 1951 EXPORT_SYMBOL(console_trylock); ··· 2107 local_irq_restore(flags); 2108 } 2109 console_locked = 0; 2110 2111 /* Release the exclusive_console once it is used */ 2112 if (unlikely(exclusive_console))