移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/include/linux/sched/user.h
..
..
@@ -8,8 +8,6 @@
8
8
 #include <linux/ratelimit.h>
9
9
 #include <linux/android_kabi.h>
10
10
 
11
-struct key;
12
-
13
11
 /*
14
12
  * Some day this will be a full-fledged user tracking system..
15
13
  */
..
..
@@ -31,18 +29,16 @@
31
29
 	unsigned long unix_inflight;	/* How many files in flight in unix sockets */
32
30
 	atomic_long_t pipe_bufs;  /* how many pages are allocated in pipe buffers */
33
31
 
34
-#ifdef CONFIG_KEYS
35
-	struct key *uid_keyring;	/* UID specific keyring */
36
-	struct key *session_keyring;	/* UID's default session keyring */
37
-#endif
38
-
39
32
 	/* Hash table maintenance information */
40
33
 	struct hlist_node uidhash_node;
41
34
 	kuid_t uid;
42
35
 
43
36
 #if defined(CONFIG_PERF_EVENTS) || defined(CONFIG_BPF_SYSCALL) || \
44
-    defined(CONFIG_NET)
37
+    defined(CONFIG_NET) || defined(CONFIG_IO_URING)
45
38
 	atomic_long_t locked_vm;
39
+#endif
40
+#ifdef CONFIG_WATCH_QUEUE
41
+	atomic_t nr_watches;	/* The number of watches this user currently has */
46
42
 #endif
47
43
 
48
44
 	/* Miscellaneous per-user rate limit */
..
..
@@ -50,6 +46,7 @@
50
46
 
51
47
 	ANDROID_KABI_RESERVE(1);
52
48
 	ANDROID_KABI_RESERVE(2);
49
+	ANDROID_OEM_DATA_ARRAY(1, 2);
53
50
 };
54
51
 
55
52
 extern int uids_sysfs_init(void);