hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/arch/x86/mm/numa_emulation.c
....@@ -6,7 +6,6 @@
66 #include <linux/errno.h>
77 #include <linux/topology.h>
88 #include <linux/memblock.h>
9
-#include <linux/bootmem.h>
109 #include <asm/dma.h>
1110
1211 #include "numa_internal.h"
....@@ -14,9 +13,10 @@
1413 static int emu_nid_to_phys[MAX_NUMNODES];
1514 static char *emu_cmdline __initdata;
1615
17
-void __init numa_emu_cmdline(char *str)
16
+int __init numa_emu_cmdline(char *str)
1817 {
1918 emu_cmdline = str;
19
+ return 0;
2020 }
2121
2222 static int __init emu_find_memblk_by_nid(int nid, const struct numa_meminfo *mi)
....@@ -325,7 +325,7 @@
325325 0, NULL, 0);
326326 }
327327
328
-int __init setup_emu2phys_nid(int *dfl_phys_nid)
328
+static int __init setup_emu2phys_nid(int *dfl_phys_nid)
329329 {
330330 int i, max_emu_nid = 0;
331331
....@@ -439,7 +439,7 @@
439439 goto no_emu;
440440
441441 if (numa_cleanup_meminfo(&ei) < 0) {
442
- pr_warning("NUMA: Warning: constructed meminfo invalid, disabling emulation\n");
442
+ pr_warn("NUMA: Warning: constructed meminfo invalid, disabling emulation\n");
443443 goto no_emu;
444444 }
445445
....@@ -450,7 +450,7 @@
450450 phys = memblock_find_in_range(0, PFN_PHYS(max_pfn_mapped),
451451 phys_size, PAGE_SIZE);
452452 if (!phys) {
453
- pr_warning("NUMA: Warning: can't allocate copy of distance table, disabling emulation\n");
453
+ pr_warn("NUMA: Warning: can't allocate copy of distance table, disabling emulation\n");
454454 goto no_emu;
455455 }
456456 memblock_reserve(phys, phys_size);