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]
/
drivers
/
acpi
/
tables.c
diff --git
a/drivers/acpi/tables.c
b/drivers/acpi/tables.c
index
a37a153
..
f938373
100644
(file)
--- a/
drivers/acpi/tables.c
+++ b/
drivers/acpi/tables.c
@@
-583,8
+583,8
@@
void __init acpi_table_upgrade(void)
}
acpi_tables_addr =
}
acpi_tables_addr =
- memblock_
find_in_range(0, ACPI_TABLE_UPGRADE_MAX_PHYS
,
-
all_tables_size, PAGE_SIZE
);
+ memblock_
phys_alloc_range(all_tables_size, PAGE_SIZE
,
+
0, ACPI_TABLE_UPGRADE_MAX_PHYS
);
if (!acpi_tables_addr) {
WARN_ON(1);
return;
if (!acpi_tables_addr) {
WARN_ON(1);
return;
@@
-599,7
+599,6
@@
void __init acpi_table_upgrade(void)
* Both memblock_reserve and e820__range_add (via arch_reserve_mem_area)
* works fine.
*/
* Both memblock_reserve and e820__range_add (via arch_reserve_mem_area)
* works fine.
*/
- memblock_reserve(acpi_tables_addr, all_tables_size);
arch_reserve_mem_area(acpi_tables_addr, all_tables_size);
/*
arch_reserve_mem_area(acpi_tables_addr, all_tables_size);
/*