diff options
Diffstat (limited to 'arch/x86/kernel/acpi/boot.c')
-rw-r--r-- | arch/x86/kernel/acpi/boot.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index e8fea7ffa306..f5ea6415b778 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
@@ -933,7 +933,8 @@ static int __init acpi_parse_hpet(struct acpi_table_header *table) | |||
933 | * the resource tree during the lateinit timeframe. | 933 | * the resource tree during the lateinit timeframe. |
934 | */ | 934 | */ |
935 | #define HPET_RESOURCE_NAME_SIZE 9 | 935 | #define HPET_RESOURCE_NAME_SIZE 9 |
936 | hpet_res = alloc_bootmem(sizeof(*hpet_res) + HPET_RESOURCE_NAME_SIZE); | 936 | hpet_res = memblock_alloc(sizeof(*hpet_res) + HPET_RESOURCE_NAME_SIZE, |
937 | 0); | ||
937 | 938 | ||
938 | hpet_res->name = (void *)&hpet_res[1]; | 939 | hpet_res->name = (void *)&hpet_res[1]; |
939 | hpet_res->flags = IORESOURCE_MEM; | 940 | hpet_res->flags = IORESOURCE_MEM; |