Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
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"
-9
-9
kernel/printk.c
-9
kernel/printk.c
···
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
···
1918
1924
return;
1919
1925
console_locked = 1;
1920
1926
console_may_schedule = 1;
1921
-
mutex_acquire(&console_lock_dep_map, 0, 0, _RET_IP_);
1922
1927
}
1923
1928
EXPORT_SYMBOL(console_lock);
1924
1929
···
1939
1946
}
1940
1947
console_locked = 1;
1941
1948
console_may_schedule = 0;
1942
-
mutex_acquire(&console_lock_dep_map, 0, 1, _RET_IP_);
1943
1949
return 1;
1944
1950
}
1945
1951
EXPORT_SYMBOL(console_trylock);
···
2099
2107
local_irq_restore(flags);
2100
2108
}
2101
2109
console_locked = 0;
2102
-
mutex_release(&console_lock_dep_map, 1, _RET_IP_);
2103
2110
2104
2111
/* Release the exclusive_console once it is used */
2105
2112
if (unlikely(exclusive_console))