The patch titled
uml: fix ->set_termios declaration
has been added to the -mm tree. Its filename is
tty-switch-to-ktermios-uml-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
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
fix-remove-the-use-of-_syscallx-macros-in-uml.patch
uml-fix-compilation-options-for-user_objs.patch
uml-ubd-driver-allow-using-up-to-16-ubd-devices.patch
uml-ubd-driver-document-some-struct-fields.patch
uml-ubd-driver-var-renames.patch
uml-ubd-driver-give-better-names-to-some-functions.patch
uml-ubd-driver-change-ubd_lock-to-be-a-mutex.patch
uml-ubd-driver-ubd_io_lock-usage-fixup.patch
uml-ubd-driver-reformat-ubd_config.patch
uml-ubd-driver-convert-do_ubd-to-a-boolean-variable.patch
uml-ubd-driver-use-bitfields-where-possible.patch
uml-ubd-driver-do-not-store-error-codes-as-fd.patch
uml-ubd-driver-various-little-changes.patch
uml-add-_text-definition-to-linker-scripts.patch
uml-add-initcalls.patch
uml-fix-prototypes.patch
uml-make-execvp-safe-for-our-usage.patch
tty-signal-tty-locking.patch
uml-add-generic-bug-support.patch
add-process_session-helper-routine-deprecate-old-field-fix-warnings-fix.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
