update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/mips/kernel/prom.c
..
..
@@ -1,18 +1,15 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * MIPS support for CONFIG_OF device tree support
3
4
  *
4
5
  * Copyright (C) 2010 Cisco Systems Inc. <dediao@cisco.com>
5
- *
6
- * This program is free software; you can redistribute it and/or modify
7
- * it under the terms of the GNU General Public License version 2 as
8
- * published by the Free Software Foundation.
9
6
  */
10
7
 
11
8
 #include <linux/init.h>
12
9
 #include <linux/export.h>
13
10
 #include <linux/errno.h>
14
11
 #include <linux/types.h>
15
-#include <linux/bootmem.h>
12
+#include <linux/memblock.h>
16
13
 #include <linux/debugfs.h>
17
14
 #include <linux/of.h>
18
15
 #include <linux/of_fdt.h>
..
..
@@ -39,29 +36,6 @@
39
36
 }
40
37
 
41
38
 #ifdef CONFIG_USE_OF
42
-void __init early_init_dt_add_memory_arch(u64 base, u64 size)
43
-{
44
-	if (base >= PHYS_ADDR_MAX) {
45
-		pr_warn("Trying to add an invalid memory region, skipped\n");
46
-		return;
47
-	}
48
-
49
-	/* Truncate the passed memory region instead of type casting */
50
-	if (base + size - 1 >= PHYS_ADDR_MAX || base + size < base) {
51
-		pr_warn("Truncate memory region %llx @ %llx to size %llx\n",
52
-			size, base, PHYS_ADDR_MAX - base);
53
-		size = PHYS_ADDR_MAX - base;
54
-	}
55
-
56
-	add_memory_region(base, size, BOOT_MEM_RAM);
57
-}
58
-
59
-int __init early_init_dt_reserve_memory_arch(phys_addr_t base,
60
-					phys_addr_t size, bool nomap)
61
-{
62
-	add_memory_region(base, size, BOOT_MEM_RESERVED);
63
-	return 0;
64
-}
65
39
 
66
40
 void __init __dt_setup_arch(void *bph)
67
41
 {