diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c
index c4f5fca..ea65666 100644
--- a/src/arch/x86/boot/acpi.c
+++ b/src/arch/x86/boot/acpi.c
@@ -281,8 +281,9 @@
 		device_t dev;
 		for (dev = all_devices; dev; dev = dev->next)
 			if (dev->ops && dev->ops->acpi_fill_ssdt_generator) {
-				current = dev->ops->acpi_fill_ssdt_generator(current, oem_table_id);
+				dev->ops->acpi_fill_ssdt_generator();
 			}
+		current = (unsigned long) acpigen_get_current();
 #else
 		current = acpi_fill_ssdt_generator(current, oem_table_id);
 #endif