Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (0fe94b9e) · Commits · 戴 / test

Pull console lockdep checking revert from Dave Airlie. The lockdep splat this showed was interesting, but it's very very old, and we won't be fixing it until 3.9. In the meantime, undo the lockdep annotation so that we don't generate the (known) console lockdep issue, and then possibly hide any potential other (unknown) lockdep problems that got disabled by the first one that triggered. * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: Revert "console: implement lockdep support for console_lock"

kernel/printk.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -87,12 +87,6 @@ static DEFINE_SEMAPHORE(console_sem);
		struct console *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
		* keeping track if we have the console semaphore held. It's
		@@ -1924,7 +1918,6 @@ void console_lock(void)
		return;
		console_locked = 1;
		console_may_schedule = 1;
		mutex_acquire(&console_lock_dep_map, 0, 0, _RET_IP_);
		}
		EXPORT_SYMBOL(console_lock);

		@@ -1946,7 +1939,6 @@ int console_trylock(void)
		}
		console_locked = 1;
		console_may_schedule = 0;
		mutex_acquire(&console_lock_dep_map, 0, 1, _RET_IP_);
		return 1;
		}
		EXPORT_SYMBOL(console_trylock);
		@@ -2107,7 +2099,6 @@ skip:
		local_irq_restore(flags);
		}
		console_locked = 0;
		mutex_release(&console_lock_dep_map, 1, _RET_IP_);

		/* Release the exclusive_console once it is used */
		if (unlikely(exclusive_console))

Admin message