diff options
| author | Felix Held <felix-coreboot@felixheld.de> | 2019-06-20 13:50:17 +0200 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2019-06-21 12:51:12 +0000 |
| commit | c469712166257da7b159773b42f067090b63e34e (patch) | |
| tree | fcde63e11584fb6e42025a08d8b61e74cf2a61e6 /src | |
| parent | 51ff9e8415263d5e3afb2aa3e85ca8bbccd166af (diff) | |
arch/x86/acpi: use ALIGN_UP instead of ALIGN
The ALIGN_UP macro is basically an alias of the ALIGN macro; with this change
it's more obvious in which direction the alignment happens.
Change-Id: I6f1b9f9bbcafeb85a6ef5c10ce4b57edc0740e72
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33627
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Lance Zhao <lance.zhao@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/x86/acpi.c | 4 | ||||
| -rw-r--r-- | src/arch/x86/include/arch/acpi.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c index 1b8aaae64b..71fc4e208f 100644 --- a/src/arch/x86/acpi.c +++ b/src/arch/x86/acpi.c @@ -864,7 +864,7 @@ unsigned long acpi_write_hpet(struct device *device, unsigned long current, hpet = (acpi_hpet_t *) current; current += sizeof(acpi_hpet_t); - current = ALIGN(current, 16); + current = ALIGN_UP(current, 16); acpi_create_hpet(hpet); acpi_add_table(rsdp, hpet); @@ -1322,7 +1322,7 @@ unsigned long write_acpi_tables(unsigned long start) acpi_write_xsdt(xsdt, oem_id, oem_table_id); printk(BIOS_DEBUG, "ACPI: * FACS\n"); - current = (ALIGN(current, 64)); + current = ALIGN_UP(current, 64); facs = (acpi_facs_t *) current; current += sizeof(acpi_facs_t); current = acpi_align_current(current); diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h index e48b2da567..6251b98142 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -1004,7 +1004,7 @@ static inline int acpi_is_wakeup_s4(void) { return 0; } static inline uintptr_t acpi_align_current(uintptr_t current) { - return ALIGN(current, 16); + return ALIGN_UP(current, 16); } /* ACPI table revisions should match the revision of the ACPI spec |