github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 22:14:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ANDROID: GKI: restore termiox fields

Browse Source 
To keep the kernel abi stable at this point in time, restore the termiox
pointer in struct tty_struct and the set_termiox() callback in struct
tty_operations that were removed in eef2158b0c ("tty: Remove dead
termiox code")

Bug: 161946584
Fixes: eef2158b0c ("tty: Remove dead termiox code")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iea4739fc4725b6ebd10fc5e0367f91d938b6e364
This commit is contained in:
Greg Kroah-Hartman 2021-05-15 09:33:55 +02:00
parent 18593eb97f
commit db77ed2052
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/tty.h
View File

@ -303,6 +303,10 @@ struct tty_struct {
spinlock_t flow_lock; spinlock_t flow_lock;
/* Termios values are protected by the termios rwsem */ /* Termios values are protected by the termios rwsem */
struct ktermios termios, termios_locked; struct ktermios termios, termios_locked;
/* termiox is estored only for ABI preservation, do not use */
struct termiox *termiox;
char name[64]; char name[64];
struct pid *pgrp; /* Protected by ctrl lock */ struct pid *pgrp; /* Protected by ctrl lock */
/* /*

4
include/linux/tty_driver.h
View File

@ -277,6 +277,10 @@ struct tty_operations {
int (*tiocmset)(struct tty_struct *tty, int (*tiocmset)(struct tty_struct *tty,
unsigned int set, unsigned int clear); unsigned int set, unsigned int clear);
int (*resize)(struct tty_struct *tty, struct winsize *ws); int (*resize)(struct tty_struct *tty, struct winsize *ws);
/* only for abi preservation */
int (*set_termiox)(struct tty_struct *tty, struct termiox *tnew);
int (*get_icount)(struct tty_struct *tty, int (*get_icount)(struct tty_struct *tty,
struct serial_icounter_struct *icount); struct serial_icounter_struct *icount);
int (*get_serial)(struct tty_struct *tty, struct serial_struct *p); int (*get_serial)(struct tty_struct *tty, struct serial_struct *p);