Immutable branch between fbdev and drm for the v4.19 merge window

(contains build fixup for the deferred console takeover feature)
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCAAGBQJbNgArAAoJEH4ztj+gR8ILJlQQAITIp6OjZDur4QfMGcy1nXkv
 aeH+w5D6ObvKa8v1nufYr5rxFoqZb8HndgKmmqdiY+dtDJupRvER3WwyH3PrZaJU
 9S0/6TUkhbRNwv7hNoR/zAV42lJxoniGax/saWokM/svyUDspW9AvcZwWdj+/bly
 +Dqg4KzEDYR0F/moAuxdoox/GpIDWs795SYvxM4vmTIcz/GAE0w1Hrzusw8kdqmH
 T+PaTwhKL91bFI6nGS5HBY2N87+7lQ2ZH9gLi5Dt1XUDCzFv/hOaT0bdNCNehMyb
 YHc39r7EroHm7l/EbTFWyJcLhgk6lj9YYuS/0BnzCOm3PU8ePX7hXSuzCCiIvVOj
 qX6UudPtnVNzqeLrcHRJ0PwQ7dhV5dHGf1ziw0ORcD5NRcqlmqd6DWBfrRCnNtDf
 rpOfkBGPn5SYdoVmgyh3rzvpTyrephb6Wx2jkHGbW0HsylnaZc18Piy1pt1eKnCQ
 gAISzUIQjbUmqqbMHY2CKs/2+H5I6zxpt5cQrdN6S3s/m5T8Alg3UeeVNleqXHZK
 7XPebhU/+l7Pf/AB7gwNM4qGVUUXQ1+Xd+NCLcwAkEmUU0gN77Kgt3AGYEJtwVB/
 papE0ZxOSOp8uTZbCegvJQ94mcCzKMgXhGXoAEvk0TBymbkowx1915v7vCzNoPTm
 TBp4iFbR38TlA50yChsB
 =WVWE
 -----END PGP SIGNATURE-----

Merge tag 'ib-fbdev-drm-v4.19-deferred-console-takeover-fixup' of https://github.com/bzolnier/linux into fbdev-for-next

Immutable branch between fbdev and drm for the v4.19 merge window
(contains build fixup for the deferred console takeover feature)
This commit is contained in:
Bartlomiej Zolnierkiewicz 2018-06-29 11:54:33 +02:00
commit 13d7f936e9

View File

@ -38,11 +38,13 @@ void dummycon_register_output_notifier(struct notifier_block *nb)
if (dummycon_putc_called)
nb->notifier_call(nb, 0, NULL);
}
EXPORT_SYMBOL_GPL(dummycon_register_output_notifier);
void dummycon_unregister_output_notifier(struct notifier_block *nb)
{
raw_notifier_chain_unregister(&dummycon_output_nh, nb);
}
EXPORT_SYMBOL_GPL(dummycon_unregister_output_notifier);
static void dummycon_putc(struct vc_data *vc, int c, int ypos, int xpos)
{