kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/arch/mips/dec/prom/memory.c
..
..
@@ -8,11 +8,10 @@
8
8
 #include <linux/init.h>
9
9
 #include <linux/kernel.h>
10
10
 #include <linux/mm.h>
11
-#include <linux/bootmem.h>
11
+#include <linux/memblock.h>
12
12
 #include <linux/types.h>
13
13
 
14
14
 #include <asm/addrspace.h>
15
-#include <asm/bootinfo.h>
16
15
 #include <asm/dec/machtype.h>
17
16
 #include <asm/dec/prom.h>
18
17
 #include <asm/page.h>
..
..
@@ -28,7 +27,7 @@
28
27
 
29
28
 #define CHUNK_SIZE 0x400000
30
29
 
31
-static inline void pmax_setup_memory_region(void)
30
+static __init void pmax_setup_memory_region(void)
32
31
 {
33
32
 	volatile unsigned char *memory_page, dummy;
34
33
 	char old_handler[0x80];
..
..
@@ -50,15 +49,14 @@
50
49
 	}
51
50
 	memcpy((void *)(CKSEG0 + 0x80), &old_handler, 0x80);
52
51
 
53
-	add_memory_region(0, (unsigned long)memory_page - CKSEG1 - CHUNK_SIZE,
54
-			  BOOT_MEM_RAM);
52
+	memblock_add(0, (unsigned long)memory_page - CKSEG1 - CHUNK_SIZE);
55
53
 }
56
54
 
57
55
 /*
58
56
  * Use the REX prom calls to get hold of the memory bitmap, and thence
59
57
  * determine memory size.
60
58
  */
61
-static inline void rex_setup_memory_region(void)
59
+static __init void rex_setup_memory_region(void)
62
60
 {
63
61
 	int i, bitmap_size;
64
62
 	unsigned long mem_start = 0, mem_size = 0;
..
..
@@ -76,13 +74,13 @@
76
74
 		else if (!mem_size)
77
75
 			mem_start += (8 * bm->pagesize);
78
76
 		else {
79
-			add_memory_region(mem_start, mem_size, BOOT_MEM_RAM);
77
+			memblock_add(mem_start, mem_size);
80
78
 			mem_start += mem_size + (8 * bm->pagesize);
81
79
 			mem_size = 0;
82
80
 		}
83
81
 	}
84
82
 	if (mem_size)
85
-		add_memory_region(mem_start, mem_size, BOOT_MEM_RAM);
83
+		memblock_add(mem_start, mem_size);
86
84
 }
87
85
 
88
86
 void __init prom_meminit(u32 magic)