diff --git a/src/northbridge/intel/gm45/acpi.c b/src/northbridge/intel/gm45/acpi.c
index 21a8cd5..8990c3b 100644
--- a/src/northbridge/intel/gm45/acpi.c
+++ b/src/northbridge/intel/gm45/acpi.c
@@ -104,7 +104,6 @@
 	return current;
 }
 
-#define ALIGN_CURRENT current = (ALIGN(current, 16))
 unsigned long northbridge_write_acpi_tables(device_t device,
 					    unsigned long start,
 					    struct acpi_rsdp *rsdp)
@@ -118,10 +117,10 @@
 	dmar = (acpi_dmar_t *) current;
 	acpi_create_dmar(dmar, 0, acpi_fill_dmar);
 	current += dmar->header.length;
-	ALIGN_CURRENT;
+	current = acpi_align_current(current);
 	acpi_add_table(rsdp, dmar);
 
-	ALIGN_CURRENT;
+	current = acpi_align_current(current);
 
 	printk(BIOS_DEBUG, "current = %lx\n", current);
 
diff --git a/src/northbridge/intel/sandybridge/acpi.c b/src/northbridge/intel/sandybridge/acpi.c
index eebf99c..4953144 100644
--- a/src/northbridge/intel/sandybridge/acpi.c
+++ b/src/northbridge/intel/sandybridge/acpi.c
@@ -235,7 +235,6 @@
 	return current;
 }
 
-#define ALIGN_CURRENT current = (ALIGN(current, 16))
 unsigned long northbridge_write_acpi_tables(struct device *const dev,
 					    unsigned long current,
 					    struct acpi_rsdp *const rsdp)
@@ -248,10 +247,10 @@
 	acpi_dmar_t *const dmar = (acpi_dmar_t *)current;
 	acpi_create_dmar(dmar, DMAR_INTR_REMAP, acpi_fill_dmar);
 	current += dmar->header.length;
-	ALIGN_CURRENT;
+	current = acpi_align_current(current);
 	acpi_add_table(rsdp, dmar);
 
-	ALIGN_CURRENT;
+	current = acpi_align_current(current);
 
 	printk(BIOS_DEBUG, "current = %lx\n", current);