summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2018-07-06 01:52:45 +0300
committerDave Airlie <airlied@redhat.com>2018-07-06 03:01:56 +0300
commita1c3b49523aeb89a7f5ffa852c29db9c4e5ac8dd (patch)
tree25119ff623073a26f79608c50cdd78a8e8b50078 /kernel
parentc5be9b54034339a7983a1167cdc80dc27fea1799 (diff)
parent968d72e6a5105a18fe17c0a8b4ef2951d0eb42dd (diff)
downloadlinux-a1c3b49523aeb89a7f5ffa852c29db9c4e5ac8dd.tar.xz
Merge tag 'drm-misc-next-2018-07-04' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 4.19: UAPI Changes: v3d: add fourcc modicfier for fourcc for the Broadcom UIF format (Eric Anholt) Cross-subsystem Changes: console/fbcon: Add support for deferred console takeover (Hans de Goede) Core Changes: dma-fence clean up, improvements and docs (Daniel Vetter) add mask function for crtc, plane, encoder and connector DRM objects(Ville Syrjälä) Driver Changes: pl111: add Nomadik LCDC variant (Linus Walleij) Signed-off-by: Dave Airlie <airlied@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180704234641.GA3981@juma
Diffstat (limited to 'kernel')
-rw-r--r--kernel/printk/printk.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 247808333ba4..3f041e7cbfc9 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2243,6 +2243,7 @@ int is_console_locked(void)
{
return console_locked;
}
+EXPORT_SYMBOL(is_console_locked);
/*
* Check if we have any console that is capable of printing while cpu is