projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
memblock: make memblock_find_in_range method private
[linux-2.6-microblaze.git]
/
arch
/
x86
/
mm
/
numa.c
diff --git
a/arch/x86/mm/numa.c
b/arch/x86/mm/numa.c
index
e94da74
..
a1b5c71
100644
(file)
--- a/
arch/x86/mm/numa.c
+++ b/
arch/x86/mm/numa.c
@@
-376,15
+376,14
@@
static int __init numa_alloc_distance(void)
cnt++;
size = cnt * cnt * sizeof(numa_distance[0]);
cnt++;
size = cnt * cnt * sizeof(numa_distance[0]);
- phys = memblock_
find_in_range(0, PFN_PHYS(max_pfn_mapped)
,
-
size, PAGE_SIZE
);
+ phys = memblock_
phys_alloc_range(size, PAGE_SIZE, 0
,
+
PFN_PHYS(max_pfn_mapped)
);
if (!phys) {
pr_warn("Warning: can't allocate distance table!\n");
/* don't retry until explicitly reset */
numa_distance = (void *)1LU;
return -ENOMEM;
}
if (!phys) {
pr_warn("Warning: can't allocate distance table!\n");
/* don't retry until explicitly reset */
numa_distance = (void *)1LU;
return -ENOMEM;
}
- memblock_reserve(phys, size);
numa_distance = __va(phys);
numa_distance_cnt = cnt;
numa_distance = __va(phys);
numa_distance_cnt = cnt;