Commit 4111b025 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[PATCH] uml: capture printk output for mconsole sysrq 



Pass sysrq output back to the mconsole client using the mechanism
introduced for stack output.

Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6f517d3f

arch/um/drivers/mconsole_kern.c

+30 −18
Original line number Diff line number Diff line
@@ -463,24 +463,6 @@ void mconsole_remove(struct mc_request *req) 
	mconsole_reply(req, err_msg, err, 0);

}



#ifdef CONFIG_MAGIC_SYSRQ

void mconsole_sysrq(struct mc_request *req)

{

	char *ptr = req->request.data;



	ptr += strlen("sysrq");

	while(isspace(*ptr)) ptr++;



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

	handle_sysrq(*ptr, &current->thread.regs, NULL);

}

#else

void mconsole_sysrq(struct mc_request *req)

{

	mconsole_reply(req, "Sysrq not compiled in", 1, 0);

}

#endif



static DEFINE_SPINLOCK(console_lock);

static LIST_HEAD(clients);

static char console_buf[MCONSOLE_MAX_DATA];
@@ -549,6 +531,36 @@ static void with_console(struct mc_request *req, void (*proc)(void *), 
	list_del(&entry.list);

}



#ifdef CONFIG_MAGIC_SYSRQ

static void sysrq_proc(void *arg)

{

	char *op = arg;



	handle_sysrq(*op, &current->thread.regs, NULL);

}



void mconsole_sysrq(struct mc_request *req)

{

	char *ptr = req->request.data;



	ptr += strlen("sysrq");

	while(isspace(*ptr)) ptr++;



	/* With 'b', the system will shut down without a chance to reply,

	 * so in this case, we reply first.

	 */

	if(*ptr == 'b')

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



	with_console(req, sysrq_proc, ptr);

}

#else

void mconsole_sysrq(struct mc_request *req)

{

	mconsole_reply(req, "Sysrq not compiled in", 1, 0);

}

#endif



static void stack_proc(void *arg)

{

	struct task_struct *from = current, *to = arg;