移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/drivers/infiniband/sw/rxe/rxe_queue.h
..
..
@@ -1,34 +1,7 @@
1
+/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */
1
2
 /*
2
3
  * Copyright (c) 2016 Mellanox Technologies Ltd. All rights reserved.
3
4
  * Copyright (c) 2015 System Fabric Works, Inc. All rights reserved.
4
- *
5
- * This software is available to you under a choice of one of two
6
- * licenses.  You may choose to be licensed under the terms of the GNU
7
- * General Public License (GPL) Version 2, available from the file
8
- * COPYING in the main directory of this source tree, or the
9
- * OpenIB.org BSD license below:
10
- *
11
- *     Redistribution and use in source and binary forms, with or
12
- *     without modification, are permitted provided that the following
13
- *     conditions are met:
14
- *
15
- *	- Redistributions of source code must retain the above
16
- *	  copyright notice, this list of conditions and the following
17
- *	  disclaimer.
18
- *
19
- *	- Redistributions in binary form must reproduce the above
20
- *	  copyright notice, this list of conditions and the following
21
- *	  disclaimer in the documentation and/or other materials
22
- *	  provided with the distribution.
23
- *
24
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
25
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
27
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
28
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
29
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
30
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
31
- * SOFTWARE.
32
5
  */
33
6
 
34
7
 #ifndef RXE_QUEUE_H
..
..
@@ -63,7 +36,7 @@
63
36
 	__u32			pad_2[31];
64
37
 	__u32			consumer_index;
65
38
 	__u32			pad_3[31];
66
-	__u8			data[0];
39
+	__u8			data[];
67
40
 };
68
41
 
69
42
 struct rxe_queue {
..
..
@@ -76,12 +49,9 @@
76
49
 	unsigned int		index_mask;
77
50
 };
78
51
 
79
-int do_mmap_info(struct rxe_dev *rxe,
80
-		 struct mminfo __user *outbuf,
81
-		 struct ib_ucontext *context,
82
-		 struct rxe_queue_buf *buf,
83
-		 size_t buf_size,
84
-		 struct rxe_mmap_info **ip_p);
52
+int do_mmap_info(struct rxe_dev *rxe, struct mminfo __user *outbuf,
53
+		 struct ib_udata *udata, struct rxe_queue_buf *buf,
54
+		 size_t buf_size, struct rxe_mmap_info **ip_p);
85
55
 
86
56
 void rxe_queue_reset(struct rxe_queue *q);
87
57
 
..
..
@@ -89,10 +59,8 @@
89
59
 				 int *num_elem,
90
60
 				 unsigned int elem_size);
91
61
 
92
-int rxe_queue_resize(struct rxe_queue *q,
93
-		     unsigned int *num_elem_p,
94
-		     unsigned int elem_size,
95
-		     struct ib_ucontext *context,
62
+int rxe_queue_resize(struct rxe_queue *q, unsigned int *num_elem_p,
63
+		     unsigned int elem_size, struct ib_udata *udata,
96
64
 		     struct mminfo __user *outbuf,
97
65
 		     /* Protect producers while resizing queue */
98
66
 		     spinlock_t *producer_lock,