+ um-fix-magic-sysrq.patch added to -mm tree

[akpm@xxxxxxxx]

The patch titled

     um: fix magic sysrq

has been added to the -mm tree.  Its filename is

     um-fix-magic-sysrq.patch

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

------------------------------------------------------
Subject: um: fix magic sysrq
From: Pekka Enberg <penberg@xxxxxxxxxxxxxx>

Fix UML compilation when CONFIG_MAGIC_SYSRQ is enabled.

Cc: Jeff Dike <jdike@xxxxxxxxxxx>
Cc: Paolo "Blaisorblade" Giarrusso <blaisorblade@xxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 arch/um/drivers/mconsole_kern.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN arch/um/drivers/mconsole_kern.c~um-fix-magic-sysrq arch/um/drivers/mconsole_kern.c
--- a/arch/um/drivers/mconsole_kern.c~um-fix-magic-sysrq
+++ a/arch/um/drivers/mconsole_kern.c
@@ -675,7 +675,7 @@ static void sysrq_proc(void *arg)
 {
 	char *op = arg;
 
-	handle_sysrq(*op, &current->thread.regs, NULL);
+	handle_sysrq(*op, NULL);
 }
 
 void mconsole_sysrq(struct mc_request *req)
_

Patches currently in -mm which might be from penberg@xxxxxxxxxxxxxx are

origin.patch
um-setup-irq-regs-in-do_irq.patch
um-fix-magic-sysrq.patch
slab-leaks3-default-y.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html