update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/ia64/mm/ioremap.c
..
..
@@ -1,16 +1,14 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * (c) Copyright 2006, 2007 Hewlett-Packard Development Company, L.P.
3
4
  *	Bjorn Helgaas <bjorn.helgaas@hp.com>
4
- *
5
- * This program is free software; you can redistribute it and/or modify
6
- * it under the terms of the GNU General Public License version 2 as
7
- * published by the Free Software Foundation.
8
5
  */
9
6
 
10
7
 #include <linux/compiler.h>
11
8
 #include <linux/module.h>
12
9
 #include <linux/efi.h>
13
10
 #include <linux/io.h>
11
+#include <linux/mm.h>
14
12
 #include <linux/vmalloc.h>
15
13
 #include <asm/io.h>
16
14
 #include <asm/meminit.h>
..
..
@@ -45,7 +43,7 @@
45
43
 	/*
46
44
 	 * For things in kern_memmap, we must use the same attribute
47
45
 	 * as the rest of the kernel.  For more details, see
48
-	 * Documentation/ia64/aliasing.txt.
46
+	 * Documentation/ia64/aliasing.rst.
49
47
 	 */
50
48
 	attr = kern_mem_attribute(phys_addr, size);
51
49
 	if (attr & EFI_MEMORY_WB)
..
..
@@ -102,14 +100,14 @@
102
100
 EXPORT_SYMBOL(ioremap);
103
101
 
104
102
 void __iomem *
105
-ioremap_nocache (unsigned long phys_addr, unsigned long size)
103
+ioremap_uc(unsigned long phys_addr, unsigned long size)
106
104
 {
107
105
 	if (kern_mem_attribute(phys_addr, size) & EFI_MEMORY_WB)
108
106
 		return NULL;
109
107
 
110
108
 	return __ioremap_uc(phys_addr);
111
109
 }
112
-EXPORT_SYMBOL(ioremap_nocache);
110
+EXPORT_SYMBOL(ioremap_uc);
113
111
 
114
112
 void
115
113
 early_iounmap (volatile void __iomem *addr, unsigned long size)