ANDROID: fix up tty_operations ABI break

In commit 287b569a5b ("tty: add the option to have a tty reject a new
ldisc"), a new callback is added.  Use the ANDROID_KABI_RESERVE(1) field
for this new callback so that the abi is preserved.

Fixes: 287b569a5b ("tty: add the option to have a tty reject a new ldisc")
Change-Id: Ib7462603da78deeaa609425ccc8a28e72cda371c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

android/abi_gki_aarch64.stg

@@ -42695,6 +42695,10 @@ member {
   id: 0x26e6fc0c
   type_id: 0x14b5803d
 }
+member {
+  id: 0x27000c61
+  type_id: 0x132e4197
+}
 member {
   id: 0x27031642
   type_id: 0x13222919
@@ -43860,6 +43864,10 @@ member {
   type_id: 0x56faddc1
   offset: 840
 }
+member {
+  id: 0x36752b74
+  type_id: 0x56faddc1
+}
 member {
   id: 0x3697c72f
   type_id: 0x55715975
@@ -44243,6 +44251,11 @@ member {
   type_id: 0x61e297e1
   offset: 64
 }
+member {
+  id: 0x3bc271e6
+  type_id: 0x60278e83
+  offset: 2112
+}
 member {
   id: 0x3bc43305
   type_id: 0x603e99d0
@@ -50840,12 +50853,6 @@ member {
   type_id: 0x92233392
   offset: 10560
 }
-member {
-  id: 0x2d081b70
-  name: "android_kabi_reserved1"
-  type_id: 0x92233392
-  offset: 2112
-}
 member {
   id: 0x2d081ba3
   name: "android_kabi_reserved1"
@@ -121023,6 +121030,11 @@ member {
   type_id: 0x19341e7e
   offset: 320
 }
+member {
+  id: 0xdb527b72
+  name: "ldisc_ok"
+  type_id: 0x2f78c9b9
+}
 member {
   id: 0xbb8e90e5
   name: "ldisc_sem"
@@ -217998,6 +218010,14 @@ struct_union {
     member_id: 0x103ee9d3
   }
 }
+struct_union {
+  id: 0x132e4197
+  kind: STRUCT
+  definition {
+    bytesize: 8
+    member_id: 0x2d081532
+  }
+}
 struct_union {
   id: 0x132f610b
   kind: STRUCT
@@ -223302,6 +223322,16 @@ struct_union {
     member_id: 0xc087b526
   }
 }
+struct_union {
+  id: 0x60278e83
+  kind: UNION
+  definition {
+    bytesize: 8
+    member_id: 0xdb527b72
+    member_id: 0x27000c61
+    member_id: 0x36752b74
+  }
+}
 struct_union {
   id: 0x603e99d0
   kind: UNION
@@ -273788,7 +273818,7 @@ struct_union {
     member_id: 0xd99430da
     member_id: 0x3d8e0610
     member_id: 0x3ba75864
-    member_id: 0x2d081b70
+    member_id: 0x3bc271e6
     member_id: 0x63760c3d
   }
 }

include/linux/tty_driver.h

@@ -381,7 +381,6 @@ struct tty_operations {
 	void (*hangup)(struct tty_struct *tty);
 	int (*break_ctl)(struct tty_struct *tty, int state);
 	void (*flush_buffer)(struct tty_struct *tty);
-	int (*ldisc_ok)(struct tty_struct *tty, int ldisc);
 	void (*set_ldisc)(struct tty_struct *tty);
 	void (*wait_until_sent)(struct tty_struct *tty, int timeout);
 	void (*send_xchar)(struct tty_struct *tty, char ch);
@@ -401,7 +400,7 @@ struct tty_operations {
 #endif
 	int (*proc_show)(struct seq_file *m, void *driver);
 
-	ANDROID_KABI_RESERVE(1);
+	ANDROID_KABI_USE(1, int (*ldisc_ok)(struct tty_struct *tty, int ldisc));
 	ANDROID_KABI_RESERVE(2);
 } __randomize_layout;