diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-25 19:46:44 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-25 19:46:44 -0500 |
commit | fffddfd6c8e0c10c42c6e2cc54ba880fcc36ebbb (patch) | |
tree | 71bc5e597124dbaf7550f1e089d675718b3ed5c0 /kernel | |
parent | 69086a78bdc973ec0b722be790b146e84ba8a8c4 (diff) | |
parent | be88298b0a3f771a4802f20c5e66af74bfd1dff1 (diff) |
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
Pull drm merge from Dave Airlie:
"Highlights:
- TI LCD controller KMS driver
- TI OMAP KMS driver merged from staging
- drop gma500 stub driver
- the fbcon locking fixes
- the vgacon dirty like zebra fix.
- open firmware videomode and hdmi common code helpers
- major locking rework for kms object handling - pageflip/cursor
won't block on polling anymore!
- fbcon helper and prime helper cleanups
- i915: all over the map, haswell power well enhancements, valleyview
macro horrors cleaned up, killing lots of legacy GTT code,
- radeon: CS ioctl unification, deprecated UMS support, gpu reset
rework, VM fixes
- nouveau: reworked thermal code, external dp/tmds encoder support
(anx9805), fences sleep instead of polling,
- exynos: all over the driver fixes."
Lovely conflict in radeon/evergreen_cs.c between commit de0babd60d8d
("drm/radeon: enforce use of radeon_get_ib_value when reading user cmd")
and the new changes that modified that evergreen_dma_cs_parse()
function.
* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (508 commits)
drm/tilcdc: only build on arm
drm/i915: Revert hdmi HDP pin checks
drm/tegra: Add list of framebuffers to debugfs
drm/tegra: Fix color expansion
drm/tegra: Split DC_CMD_STATE_CONTROL register write
drm/tegra: Implement page-flipping support
drm/tegra: Implement VBLANK support
drm/tegra: Implement .mode_set_base()
drm/tegra: Add plane support
drm/tegra: Remove bogus tegra_framebuffer structure
drm: Add consistency check for page-flipping
drm/radeon: Use generic HDMI infoframe helpers
drm/tegra: Use generic HDMI infoframe helpers
drm: Add EDID helper documentation
drm: Add HDMI infoframe helpers
video: Add generic HDMI infoframe helpers
drm: Add some missing forward declarations
drm: Move mode tables to drm_edid.c
drm: Remove duplicate drm_mode_cea_vic()
gma500: Fix n, m1 and m2 clock limits for sdvo and lvds
...
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/printk.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index f24633afa46a..0b31715f335a 100644 --- a/kernel/printk.c +++ b/kernel/printk.c | |||
@@ -88,6 +88,12 @@ static DEFINE_SEMAPHORE(console_sem); | |||
88 | struct console *console_drivers; | 88 | struct console *console_drivers; |
89 | EXPORT_SYMBOL_GPL(console_drivers); | 89 | EXPORT_SYMBOL_GPL(console_drivers); |
90 | 90 | ||
91 | #ifdef CONFIG_LOCKDEP | ||
92 | static struct lockdep_map console_lock_dep_map = { | ||
93 | .name = "console_lock" | ||
94 | }; | ||
95 | #endif | ||
96 | |||
91 | /* | 97 | /* |
92 | * This is used for debugging the mess that is the VT code by | 98 | * This is used for debugging the mess that is the VT code by |
93 | * keeping track if we have the console semaphore held. It's | 99 | * keeping track if we have the console semaphore held. It's |
@@ -1919,6 +1925,7 @@ void console_lock(void) | |||
1919 | return; | 1925 | return; |
1920 | console_locked = 1; | 1926 | console_locked = 1; |
1921 | console_may_schedule = 1; | 1927 | console_may_schedule = 1; |
1928 | mutex_acquire(&console_lock_dep_map, 0, 0, _RET_IP_); | ||
1922 | } | 1929 | } |
1923 | EXPORT_SYMBOL(console_lock); | 1930 | EXPORT_SYMBOL(console_lock); |
1924 | 1931 | ||
@@ -1940,6 +1947,7 @@ int console_trylock(void) | |||
1940 | } | 1947 | } |
1941 | console_locked = 1; | 1948 | console_locked = 1; |
1942 | console_may_schedule = 0; | 1949 | console_may_schedule = 0; |
1950 | mutex_acquire(&console_lock_dep_map, 0, 1, _RET_IP_); | ||
1943 | return 1; | 1951 | return 1; |
1944 | } | 1952 | } |
1945 | EXPORT_SYMBOL(console_trylock); | 1953 | EXPORT_SYMBOL(console_trylock); |
@@ -2102,6 +2110,7 @@ skip: | |||
2102 | local_irq_restore(flags); | 2110 | local_irq_restore(flags); |
2103 | } | 2111 | } |
2104 | console_locked = 0; | 2112 | console_locked = 0; |
2113 | mutex_release(&console_lock_dep_map, 1, _RET_IP_); | ||
2105 | 2114 | ||
2106 | /* Release the exclusive_console once it is used */ | 2115 | /* Release the exclusive_console once it is used */ |
2107 | if (unlikely(exclusive_console)) | 2116 | if (unlikely(exclusive_console)) |