[Devel] [PATCH RHEL9 COMMIT] ms/tty: Make ldisc ->set_termios() old ktermios const

Konstantin Khorenko khorenko at virtuozzo.com
Fri Nov 3 21:03:15 MSK 2023


The commit is pushed to "branch-rh9-5.14.0-284.25.1.vz9.30.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh9-5.14.0-284.25.1.vz9.30.10
------>
commit be520bc767af8cd32c1abd7a51159b87a35217cb
Author: Ilpo Järvinen <ilpo.jarvinen at linux.intel.com>
Date:   Tue Aug 16 14:57:36 2022 +0300

    ms/tty: Make ldisc ->set_termios() old ktermios const
    
    There should be no reason to adjust old ktermios which is going to get
    discarded anyway.
    
    Reviewed-by: Andy Shevchenko <andy.shevchenko at gmail.com>
    Signed-off-by: Ilpo Järvinen <ilpo.jarvinen at linux.intel.com>
    Link: https://lore.kernel.org/r/20220816115739.10928-6-ilpo.jarvinen@linux.intel.com
    Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
    
    Getting rid of compilation warnings.
    
    https://virtuozzo.atlassian.net/browse/PSBM-148793
    
    Feature: fix ms/drivers
    
    (cherry picked from commit 8b7d2d95cf82f8ca034ac65d0f39a2b3359b680f)
    Signed-off-by: Konstantin Khorenko <khorenko at virtuozzo.com>
---
 drivers/tty/n_tty.c       | 3 +--
 include/linux/tty_ldisc.h | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index 2e1b4c6a7371..96c9200d402c 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -1723,8 +1723,7 @@ static int n_tty_receive_buf2(struct tty_struct *tty, const unsigned char *cp,
  *
  *	Locking: Caller holds tty->termios_rwsem
  */
-
-static void n_tty_set_termios(struct tty_struct *tty, struct ktermios *old)
+static void n_tty_set_termios(struct tty_struct *tty, const struct ktermios *old)
 {
 	struct n_tty_data *ldata = tty->disc_data;
 
diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
index 5d0cd4a42964..2dc83db64863 100644
--- a/include/linux/tty_ldisc.h
+++ b/include/linux/tty_ldisc.h
@@ -170,7 +170,6 @@ extern int ldsem_down_write_nested(struct ld_semaphore *sem, int subclass,
 		ldsem_down_write(sem, timeout)
 #endif
 
-
 struct tty_ldisc_ops {
 	char	*name;
 	int	num;
@@ -191,7 +190,7 @@ struct tty_ldisc_ops {
 			unsigned long arg);
 	int	(*compat_ioctl)(struct tty_struct *tty, unsigned int cmd,
 			unsigned long arg);
-	void	(*set_termios)(struct tty_struct *tty, struct ktermios *old);
+	void	(*set_termios)(struct tty_struct *tty, const struct ktermios *old);
 	__poll_t (*poll)(struct tty_struct *, struct file *,
 			     struct poll_table_struct *);
 	void	(*hangup)(struct tty_struct *tty);


More information about the Devel mailing list