update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/acpi/acpica/dswload.c
..
..
@@ -3,7 +3,7 @@
3
3
  *
4
4
  * Module Name: dswload - Dispatcher first pass namespace load callbacks
5
5
  *
6
- * Copyright (C) 2000 - 2018, Intel Corp.
6
+ * Copyright (C) 2000 - 2020, Intel Corp.
7
7
  *
8
8
  *****************************************************************************/
9
9
 
..
..
@@ -14,7 +14,6 @@
14
14
 #include "acdispat.h"
15
15
 #include "acinterp.h"
16
16
 #include "acnamesp.h"
17
-
18
17
 #ifdef ACPI_ASL_COMPILER
19
18
 #include "acdisasm.h"
20
19
 #endif
..
..
@@ -73,12 +72,10 @@
73
72
 
74
73
 		/* Execution pass */
75
74
 
76
-#ifndef ACPI_NO_METHOD_EXECUTION
77
75
 		walk_state->parse_flags |= ACPI_PARSE_EXECUTE |
78
76
 		    ACPI_PARSE_DELETE_TREE;
79
77
 		walk_state->descending_callback = acpi_ds_exec_begin_op;
80
78
 		walk_state->ascending_callback = acpi_ds_exec_end_op;
81
-#endif
82
79
 		break;
83
80
 
84
81
 	default:
..
..
@@ -364,7 +361,7 @@
364
361
 
365
362
 	/* Initialize the op */
366
363
 
367
-#if (defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY))
364
+#ifdef ACPI_CONSTANT_EVAL_ONLY
368
365
 	op->named.path = path;
369
366
 #endif
370
367
 
..
..
@@ -401,7 +398,6 @@
401
398
 	union acpi_parse_object *op;
402
399
 	acpi_object_type object_type;
403
400
 	acpi_status status = AE_OK;
404
-
405
401
 #ifdef ACPI_ASL_COMPILER
406
402
 	u8 param_count;
407
403
 #endif
..
..
@@ -443,7 +439,6 @@
443
439
 
444
440
 	object_type = walk_state->op_info->object_type;
445
441
 
446
-#ifndef ACPI_NO_METHOD_EXECUTION
447
442
 	if (walk_state->op_info->flags & AML_FIELD) {
448
443
 		/*
449
444
 		 * If we are executing a method, do not create any namespace objects
..
..
@@ -487,7 +482,6 @@
487
482
 			}
488
483
 		}
489
484
 	}
490
-#endif
491
485
 
492
486
 	if (op->common.aml_opcode == AML_NAME_OP) {
493
487