update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/arm/mach-bcm/platsmp.c
..
..
@@ -1,15 +1,7 @@
1
+// SPDX-License-Identifier: GPL-2.0
1
2
 /*
2
3
  * Copyright (C) 2014-2015 Broadcom Corporation
3
4
  * Copyright 2014 Linaro Limited
4
- *
5
- * This program is free software; you can redistribute it and/or
6
- * modify it under the terms of the GNU General Public License as
7
- * published by the Free Software Foundation version 2.
8
- *
9
- * This program is distributed "as is" WITHOUT ANY WARRANTY of any
10
- * kind, whether express or implied; without even the implied warranty
11
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
- * GNU General Public License for more details.
13
5
  */
14
6
 
15
7
 #include <linux/cpumask.h>
..
..
@@ -29,6 +21,8 @@
29
21
 #include <asm/smp.h>
30
22
 #include <asm/smp_plat.h>
31
23
 #include <asm/smp_scu.h>
24
+
25
+#include "platsmp.h"
32
26
 
33
27
 /* Size of mapped Cortex A9 SCU address space */
34
28
 #define CORTEX_A9_SCU_SIZE	0x58
..
..
@@ -111,7 +105,7 @@
111
105
 	if (!secondary_boot_addr)
112
106
 		return -EINVAL;
113
107
 
114
-	sku_rom_lut = ioremap_nocache((phys_addr_t)secondary_boot_addr,
108
+	sku_rom_lut = ioremap((phys_addr_t)secondary_boot_addr,
115
109
 				      sizeof(phys_addr_t));
116
110
 	if (!sku_rom_lut) {
117
111
 		pr_warn("unable to ioremap SKU-ROM LUT register for cpu %u\n", cpu);
..
..
@@ -180,7 +174,7 @@
180
174
 	if (!secondary_boot_addr)
181
175
 		return -EINVAL;
182
176
 
183
-	boot_reg = ioremap_nocache((phys_addr_t)secondary_boot_addr,
177
+	boot_reg = ioremap((phys_addr_t)secondary_boot_addr,
184
178
 				   sizeof(phys_addr_t));
185
179
 	if (!boot_reg) {
186
180
 		pr_err("unable to map boot register for cpu %u\n", cpu_id);