diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-04-11 08:49:31 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-04-11 08:49:31 +0200 |
| commit | 4729277156cf18acd9b9b04d6ef8c2a8a7bf00dc (patch) | |
| tree | 783b640be1166813cab736e7cabbb9e48acb876d /drivers | |
| parent | 5af218439f3a4c9ca7139a40e5d047fe1ea39551 (diff) | |
| parent | 687d77a5f7b2aae4ea0507888648823f7c24e974 (diff) | |
Merge branch 'WIP.x86/boot' into x86/boot, to pick up ready branch
The E820 rework in WIP.x86/boot has gone through a couple of weeks
of exposure in -tip, merge it in a wider fashion.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/tables.c | 2 | ||||
| -rw-r--r-- | drivers/char/agp/amd64-agp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index 2604189d6cd1..9b9ac04593fb 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -556,7 +556,7 @@ void __init acpi_table_upgrade(void) * But it's not enough on X86 because ioremap will * complain later (used by acpi_os_map_memory) that the pages * that should get mapped are not marked "reserved". - * Both memblock_reserve and e820_add_region (via arch_reserve_mem_area) + * Both memblock_reserve and e820__range_add (via arch_reserve_mem_area) * works fine. */ memblock_reserve(acpi_tables_addr, all_tables_size); diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c index 0ef350010766..c99cd19d9147 100644 --- a/drivers/char/agp/amd64-agp.c +++ b/drivers/char/agp/amd64-agp.c @@ -14,7 +14,7 @@ #include <linux/agp_backend.h> #include <linux/mmzone.h> #include <asm/page.h> /* PAGE_SIZE */ -#include <asm/e820.h> +#include <asm/e820/api.h> #include <asm/amd_nb.h> #include <asm/gart.h> #include "agp.h" |