mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/xen/pvcalls-back.c
..
..
@@ -1,15 +1,6 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * (c) 2017 Stefano Stabellini <stefano@aporeto.com>
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 as published by
6
- * the Free Software Foundation; either version 2 of the License, or
7
- * (at your option) any later version.
8
- *
9
- * This program is distributed in the hope that it will be useful,
10
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
11
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
- * GNU General Public License for more details.
13
4
  */
14
5
 
15
6
 #include <linux/inet.h>
..
..
@@ -33,7 +24,7 @@
33
24
 #define PVCALLS_VERSIONS "1"
34
25
 #define MAX_RING_ORDER XENBUS_MAX_RING_GRANT_ORDER
35
26
 
36
-struct pvcalls_back_global {
27
+static struct pvcalls_back_global {
37
28
 	struct list_head frontends;
38
29
 	struct semaphore frontends_lock;
39
30
 } pvcalls_back_global;
..
..
@@ -138,13 +129,13 @@
138
129
 	if (masked_prod < masked_cons) {
139
130
 		vec[0].iov_base = data->in + masked_prod;
140
131
 		vec[0].iov_len = wanted;
141
-		iov_iter_kvec(&msg.msg_iter, ITER_KVEC|WRITE, vec, 1, wanted);
132
+		iov_iter_kvec(&msg.msg_iter, WRITE, vec, 1, wanted);
142
133
 	} else {
143
134
 		vec[0].iov_base = data->in + masked_prod;
144
135
 		vec[0].iov_len = array_size - masked_prod;
145
136
 		vec[1].iov_base = data->in;
146
137
 		vec[1].iov_len = wanted - vec[0].iov_len;
147
-		iov_iter_kvec(&msg.msg_iter, ITER_KVEC|WRITE, vec, 2, wanted);
138
+		iov_iter_kvec(&msg.msg_iter, WRITE, vec, 2, wanted);
148
139
 	}
149
140
 
150
141
 	atomic_set(&map->read, 0);
..
..
@@ -197,13 +188,13 @@
197
188
 	if (pvcalls_mask(prod, array_size) > pvcalls_mask(cons, array_size)) {
198
189
 		vec[0].iov_base = data->out + pvcalls_mask(cons, array_size);
199
190
 		vec[0].iov_len = size;
200
-		iov_iter_kvec(&msg.msg_iter, ITER_KVEC|READ, vec, 1, size);
191
+		iov_iter_kvec(&msg.msg_iter, READ, vec, 1, size);
201
192
 	} else {
202
193
 		vec[0].iov_base = data->out + pvcalls_mask(cons, array_size);
203
194
 		vec[0].iov_len = array_size - pvcalls_mask(cons, array_size);
204
195
 		vec[1].iov_base = data->out;
205
196
 		vec[1].iov_len = size - vec[0].iov_len;
206
-		iov_iter_kvec(&msg.msg_iter, ITER_KVEC|READ, vec, 2, size);
197
+		iov_iter_kvec(&msg.msg_iter, READ, vec, 2, size);
207
198
 	}
208
199
 
209
200
 	atomic_set(&map->write, 0);
..
..
@@ -322,7 +313,7 @@
322
313
 		struct pvcalls_fedata *fedata,
323
314
 		uint64_t id,
324
315
 		grant_ref_t ref,
325
-		uint32_t evtchn,
316
+		evtchn_port_t evtchn,
326
317
 		struct socket *sock)
327
318
 {
328
319
 	int ret;
..
..
@@ -930,7 +921,8 @@
930
921
 
931
922
 static int backend_connect(struct xenbus_device *dev)
932
923
 {
933
-	int err, evtchn;
924
+	int err;
925
+	evtchn_port_t evtchn;
934
926
 	grant_ref_t ring_ref;
935
927
 	struct pvcalls_fedata *fedata = NULL;
936
928