From: Greg Kroah-Hartman Date: Wed, 27 Jul 2022 10:05:54 +0000 (+0200) Subject: fix up backport of tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write... X-Git-Tag: v4.9.325~21 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=806774becb491b91d78503b3e34920b48bf15a3f;p=thirdparty%2Fkernel%2Fstable-queue.git fix up backport of tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch --- diff --git a/queue-4.14/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch b/queue-4.14/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch index 8e0c3214d6f..f3cde9429ca 100644 --- a/queue-4.14/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch +++ b/queue-4.14/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch @@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman --- drivers/tty/pty.c | 14 ++------------ drivers/tty/tty_buffer.c | 31 +++++++++++++++++++++++++++++++ - include/linux/tty.h | 3 +++ + include/linux/tty_flip.h | 3 +++ 3 files changed, 36 insertions(+), 12 deletions(-) --- a/drivers/tty/pty.c @@ -106,13 +106,13 @@ Signed-off-by: Greg Kroah-Hartman * tty_buffer_init - prepare a tty buffer structure * @tty: tty to initialise * ---- a/include/linux/tty.h -+++ b/include/linux/tty.h -@@ -798,4 +798,7 @@ static inline void proc_tty_unregister_d - #define tty_info_ratelimited(tty, f, ...) \ - tty_msg(pr_info_ratelimited, tty, f, ##__VA_ARGS__) +--- a/include/linux/tty_flip.h ++++ b/include/linux/tty_flip.h +@@ -39,4 +39,7 @@ static inline int tty_insert_flip_string + extern void tty_buffer_lock_exclusive(struct tty_port *port); + extern void tty_buffer_unlock_exclusive(struct tty_port *port); +int tty_insert_flip_string_and_push_buffer(struct tty_port *port, + const unsigned char *chars, size_t cnt); + - #endif + #endif /* _LINUX_TTY_FLIP_H */ diff --git a/queue-4.19/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch b/queue-4.19/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch index 5f48f659dd9..0076f48b917 100644 --- a/queue-4.19/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch +++ b/queue-4.19/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch @@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman --- drivers/tty/pty.c | 14 ++------------ drivers/tty/tty_buffer.c | 31 +++++++++++++++++++++++++++++++ - include/linux/tty.h | 3 +++ + include/linux/tty_flip.h | 3 +++ 3 files changed, 36 insertions(+), 12 deletions(-) --- a/drivers/tty/pty.c @@ -106,13 +106,13 @@ Signed-off-by: Greg Kroah-Hartman * tty_buffer_init - prepare a tty buffer structure * @tty: tty to initialise * ---- a/include/linux/tty.h -+++ b/include/linux/tty.h -@@ -800,4 +800,7 @@ static inline void proc_tty_unregister_d - #define tty_info_ratelimited(tty, f, ...) \ - tty_msg(pr_info_ratelimited, tty, f, ##__VA_ARGS__) +--- a/include/linux/tty_flip.h ++++ b/include/linux/tty_flip.h +@@ -39,4 +39,7 @@ static inline int tty_insert_flip_string + extern void tty_buffer_lock_exclusive(struct tty_port *port); + extern void tty_buffer_unlock_exclusive(struct tty_port *port); +int tty_insert_flip_string_and_push_buffer(struct tty_port *port, + const unsigned char *chars, size_t cnt); + - #endif + #endif /* _LINUX_TTY_FLIP_H */ diff --git a/queue-5.10/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch b/queue-5.10/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch index 0fbef1bef6a..0815f525333 100644 --- a/queue-5.10/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch +++ b/queue-5.10/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch @@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman --- drivers/tty/pty.c | 14 ++------------ drivers/tty/tty_buffer.c | 31 +++++++++++++++++++++++++++++++ - include/linux/tty.h | 3 +++ + include/linux/tty_flip.h | 3 +++ 3 files changed, 36 insertions(+), 12 deletions(-) --- a/drivers/tty/pty.c @@ -106,13 +106,13 @@ Signed-off-by: Greg Kroah-Hartman * tty_buffer_init - prepare a tty buffer structure * @port: tty port to initialise * ---- a/include/linux/tty.h -+++ b/include/linux/tty.h -@@ -798,4 +798,7 @@ static inline void proc_tty_unregister_d - #define tty_info_ratelimited(tty, f, ...) \ - tty_msg(pr_info_ratelimited, tty, f, ##__VA_ARGS__) +--- a/include/linux/tty_flip.h ++++ b/include/linux/tty_flip.h +@@ -39,4 +39,7 @@ static inline int tty_insert_flip_string + extern void tty_buffer_lock_exclusive(struct tty_port *port); + extern void tty_buffer_unlock_exclusive(struct tty_port *port); +int tty_insert_flip_string_and_push_buffer(struct tty_port *port, + const unsigned char *chars, size_t cnt); + - #endif + #endif /* _LINUX_TTY_FLIP_H */ diff --git a/queue-5.4/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch b/queue-5.4/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch index 44f9235104b..66c19e67816 100644 --- a/queue-5.4/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch +++ b/queue-5.4/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch @@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman --- drivers/tty/pty.c | 14 ++------------ drivers/tty/tty_buffer.c | 31 +++++++++++++++++++++++++++++++ - include/linux/tty.h | 3 +++ + include/linux/tty_flip.h | 3 +++ 3 files changed, 36 insertions(+), 12 deletions(-) --- a/drivers/tty/pty.c @@ -106,13 +106,13 @@ Signed-off-by: Greg Kroah-Hartman * tty_buffer_init - prepare a tty buffer structure * @tty: tty to initialise * ---- a/include/linux/tty.h -+++ b/include/linux/tty.h -@@ -798,4 +798,7 @@ static inline void proc_tty_unregister_d - #define tty_info_ratelimited(tty, f, ...) \ - tty_msg(pr_info_ratelimited, tty, f, ##__VA_ARGS__) +--- a/include/linux/tty_flip.h ++++ b/include/linux/tty_flip.h +@@ -39,4 +39,7 @@ static inline int tty_insert_flip_string + extern void tty_buffer_lock_exclusive(struct tty_port *port); + extern void tty_buffer_unlock_exclusive(struct tty_port *port); +int tty_insert_flip_string_and_push_buffer(struct tty_port *port, + const unsigned char *chars, size_t cnt); + - #endif + #endif /* _LINUX_TTY_FLIP_H */