.. | .. |
---|
6 | 6 | #include <linux/errno.h> |
---|
7 | 7 | #include <linux/topology.h> |
---|
8 | 8 | #include <linux/memblock.h> |
---|
9 | | -#include <linux/bootmem.h> |
---|
10 | 9 | #include <asm/dma.h> |
---|
11 | 10 | |
---|
12 | 11 | #include "numa_internal.h" |
---|
.. | .. |
---|
14 | 13 | static int emu_nid_to_phys[MAX_NUMNODES]; |
---|
15 | 14 | static char *emu_cmdline __initdata; |
---|
16 | 15 | |
---|
17 | | -void __init numa_emu_cmdline(char *str) |
---|
| 16 | +int __init numa_emu_cmdline(char *str) |
---|
18 | 17 | { |
---|
19 | 18 | emu_cmdline = str; |
---|
| 19 | + return 0; |
---|
20 | 20 | } |
---|
21 | 21 | |
---|
22 | 22 | static int __init emu_find_memblk_by_nid(int nid, const struct numa_meminfo *mi) |
---|
.. | .. |
---|
325 | 325 | 0, NULL, 0); |
---|
326 | 326 | } |
---|
327 | 327 | |
---|
328 | | -int __init setup_emu2phys_nid(int *dfl_phys_nid) |
---|
| 328 | +static int __init setup_emu2phys_nid(int *dfl_phys_nid) |
---|
329 | 329 | { |
---|
330 | 330 | int i, max_emu_nid = 0; |
---|
331 | 331 | |
---|
.. | .. |
---|
439 | 439 | goto no_emu; |
---|
440 | 440 | |
---|
441 | 441 | 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"); |
---|
443 | 443 | goto no_emu; |
---|
444 | 444 | } |
---|
445 | 445 | |
---|
.. | .. |
---|
450 | 450 | phys = memblock_find_in_range(0, PFN_PHYS(max_pfn_mapped), |
---|
451 | 451 | phys_size, PAGE_SIZE); |
---|
452 | 452 | 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"); |
---|
454 | 454 | goto no_emu; |
---|
455 | 455 | } |
---|
456 | 456 | memblock_reserve(phys, phys_size); |
---|