update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/infiniband/sw/rxe/rxe_task.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_TASK_H
..
..
@@ -46,24 +19,21 @@
46
19
  * called again.
47
20
  */
48
21
 struct rxe_task {
49
-	void			*obj;
50
22
 	struct tasklet_struct	tasklet;
51
23
 	int			state;
52
24
 	spinlock_t		state_lock; /* spinlock for task state */
53
25
 	void			*arg;
54
26
 	int			(*func)(void *arg);
55
27
 	int			ret;
56
-	char			name[16];
57
28
 	bool			destroyed;
58
29
 };
59
30
 
60
31
 /*
61
32
  * init rxe_task structure
62
33
  *	arg  => parameter to pass to fcn
63
- *	fcn  => function to call until it returns != 0
34
+ *	func => function to call until it returns != 0
64
35
  */
65
-int rxe_init_task(void *obj, struct rxe_task *task,
66
-		  void *arg, int (*func)(void *), char *name);
36
+int rxe_init_task(struct rxe_task *task, void *arg, int (*func)(void *));
67
37
 
68
38
 /* cleanup task */
69
39
 void rxe_cleanup_task(struct rxe_task *task);
..
..
@@ -80,7 +50,7 @@
80
50
  * work to do someone must reschedule the task before
81
51
  * leaving
82
52
  */
83
-void rxe_do_task(unsigned long data);
53
+void rxe_do_task(struct tasklet_struct *t);
84
54
 
85
55
 /* run a task, else schedule it to run as a tasklet, The decision
86
56
  * to run or schedule tasklet is based on the parameter sched.