Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce804377 authored by Anton Ivanov's avatar Anton Ivanov Committed by Greg Kroah-Hartman
Browse files

um: Fix uml_mconsole stop/go 



commit 1a3a6a2a035bb6c3a7ef4c788d8fd69a7b2d6284 upstream.

Moving to an EPOLL based IRQ controller broke uml_mconsole stop/go
commands. This fixes it and restores stop/go functionality.

Fixes: ff6a1798 ("Epoll based IRQ controller")
Signed-off-by: default avatarAnton Ivanov <anton.ivanov@cambridgegreys.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 337eb955

arch/um/drivers/mconsole_kern.c

+2 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ void mconsole_go(struct mc_request *req) 


void mconsole_stop(struct mc_request *req)

{

	deactivate_fd(req->originating_fd, MCONSOLE_IRQ);

	block_signals();

	os_set_fd_block(req->originating_fd, 1);

	mconsole_reply(req, "stopped", 0, 0);

	for (;;) {
@@ -240,6 +240,7 @@ void mconsole_stop(struct mc_request *req) 
	}

	os_set_fd_block(req->originating_fd, 0);

	mconsole_reply(req, "", 0, 0);

	unblock_signals();

}



static DEFINE_SPINLOCK(mc_devices_lock);