The patch titled
uml: fix ->set_termios declaration
has been removed from the -mm tree. Its filename was
tty-switch-to-ktermios-uml-fix.patch
This patch was dropped because it was folded into tty-switch-to-ktermios.patch
------------------------------------------------------
Subject: uml: fix ->set_termios declaration
From: Jeff Dike <jdike@xxxxxxxxxxx>
The 'old' argument of tty_operations->set_termios changed from struct
termios to struct ktermios.
Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxx>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/um/drivers/line.c | 2 +-
arch/um/include/line.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff -puN arch/um/drivers/line.c~tty-switch-to-ktermios-uml-fix arch/um/drivers/line.c
--- a/arch/um/drivers/line.c~tty-switch-to-ktermios-uml-fix
+++ a/arch/um/drivers/line.c
@@ -246,7 +246,7 @@ out_up:
return ret;
}
-void line_set_termios(struct tty_struct *tty, struct termios * old)
+void line_set_termios(struct tty_struct *tty, struct ktermios * old)
{
/* nothing */
}
diff -puN arch/um/include/line.h~tty-switch-to-ktermios-uml-fix arch/um/include/line.h
--- a/arch/um/include/line.h~tty-switch-to-ktermios-uml-fix
+++ a/arch/um/include/line.h
@@ -76,7 +76,7 @@ extern int line_setup(struct line *lines
extern int line_write(struct tty_struct *tty, const unsigned char *buf,
int len);
extern void line_put_char(struct tty_struct *tty, unsigned char ch);
-extern void line_set_termios(struct tty_struct *tty, struct termios * old);
+extern void line_set_termios(struct tty_struct *tty, struct ktermios * old);
extern int line_chars_in_buffer(struct tty_struct *tty);
extern void line_flush_buffer(struct tty_struct *tty);
extern void line_flush_chars(struct tty_struct *tty);
_
Patches currently in -mm which might be from jdike@xxxxxxxxxxx are
origin.patch
tty-signal-tty-locking.patch
uml-add-generic-bug-support.patch
add-process_session-helper-routine-deprecate-old-field.patch
tty-switch-to-ktermios.patch
tty-switch-to-ktermios-uml-fix.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
