移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/include/linux/mmc/core.h
..
..
@@ -1,9 +1,6 @@
1
+/* SPDX-License-Identifier: GPL-2.0-only */
1
2
 /*
2
3
  *  linux/include/linux/mmc/core.h
3
- *
4
- * This program is free software; you can redistribute it and/or modify
5
- * it under the terms of the GNU General Public License version 2 as
6
- * published by the Free Software Foundation.
7
4
  */
8
5
 #ifndef LINUX_MMC_CORE_H
9
6
 #define LINUX_MMC_CORE_H
..
..
@@ -110,9 +107,6 @@
110
107
  */
111
108
 
112
109
 	unsigned int		busy_timeout;	/* busy detect timeout in ms */
113
-	/* Set this flag only for blocking sanitize request */
114
-	bool			sanitize_busy;
115
-
116
110
 	struct mmc_data		*data;		/* data segment associated with cmd */
117
111
 	struct mmc_request	*mrq;		/* associated request */
118
112
 };
..
..
@@ -168,24 +162,12 @@
168
162
 	bool			cap_cmd_during_tfr;
169
163
 
170
164
 	int			tag;
171
-#ifdef CONFIG_MMC_CRYPTO
172
-	int crypto_key_slot;
173
-	u64 data_unit_num;
174
-	const struct blk_crypto_key *crypto_key;
175
-#endif
176
-};
177
165
 
178
166
 #ifdef CONFIG_MMC_CRYPTO
179
-static inline bool mmc_request_crypto_enabled(const struct mmc_request *mrq)
180
-{
181
-	return mrq->crypto_key != NULL;
182
-}
183
-#else
184
-static inline bool mmc_request_crypto_enabled(const struct mmc_request *mrq)
185
-{
186
-	return false;
187
-}
167
+	const struct bio_crypt_ctx *crypto_ctx;
168
+	int			crypto_key_slot;
188
169
 #endif
170
+};
189
171
 
190
172
 struct mmc_card;
191
173