From e06363e56dbe171ec7fc755e64fbf62d3ac94adb Mon Sep 17 00:00:00 2001
From: Kevin O'Connor <kevin@koconnor.net>
Date: Fri, 29 Aug 2008 21:12:03 -0400
Subject: [PATCH] Use ALIGN() macro in place of open-coded aligns.

---
 src/acpi.c    | 5 ++---
 src/pciinit.c | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/acpi.c b/src/acpi.c
index 18fc2d5..7dd4224 100644
--- a/src/acpi.c
+++ b/src/acpi.c
@@ -309,8 +309,7 @@ void acpi_bios_init(void)
     fadt = (void *)(addr);
     addr += sizeof(*fadt);
 
-    /* XXX: FACS should be in RAM */
-    addr = (addr + 63) & ~63; /* 64 byte alignment for FACS */
+    addr = ALIGN(addr, 64);
     facs_addr = addr;
     facs = (void *)(addr);
     addr += sizeof(*facs);
@@ -324,7 +323,7 @@ void acpi_bios_init(void)
     addr += acpi_build_processor_ssdt(ssdt);
 
     int smp_cpus = smp_probe();
-    addr = (addr + 7) & ~7;
+    addr = ALIGN(addr, 8);
     madt_addr = addr;
     madt_size = sizeof(*madt) +
         sizeof(struct madt_processor_apic) * smp_cpus +
diff --git a/src/pciinit.c b/src/pciinit.c
index 15fa9b7..92ae2d0 100644
--- a/src/pciinit.c
+++ b/src/pciinit.c
@@ -144,7 +144,7 @@ static void pci_bios_init_device(PCIDevice d)
         /* default memory mappings */
         for(i = 0; i < PCI_NUM_REGIONS; i++) {
             int ofs;
-            u32 val, size ;
+            u32 val, size;
 
             if (i == PCI_ROM_SLOT)
                 ofs = 0x30;
@@ -160,7 +160,7 @@ static void pci_bios_init_device(PCIDevice d)
                     paddr = &pci_bios_bigmem_addr;
                 else
                     paddr = &pci_bios_mem_addr;
-                *paddr = (*paddr + size - 1) & ~(size - 1);
+                *paddr = ALIGN(*paddr, size);
                 pci_set_io_region_addr(d, i, *paddr);
                 *paddr += size;
             }
-- 
2.25.1