don't use alloc_bootmem in drivers/acpi/table.c
PATCH 1/1 don't use alloc_bootmem in drivers/acpi/table.c
Some platforms use the ACPI tables to find memory, so using alloc_bootmem there won't work.
Thanks,
Jesse
drivers/acpi/tables.c +2 -13
@@ -69,7 +69,8 @@static unsigned long sdt_pa;/* Physical Address */ static unsigned long sdt_count;/* Table count */ -static struct acpi_table_sdt *sdt_entry; + +static struct acpi_table_sdt sdt_entry[ACPI_MAX_TABLES ];void acpi_table_print (
@@ -425,12 +426,6 @@ sdt_count =ACPI_MAX_TABLES ; } - sdt_entry =alloc_bootmem (sdt_count *sizeof (struct acpi_table_sdt )); -if (!sdt_entry) { -printk (KERN_ERR "ACPI: Could not allocate mem for SDT entries!\n" ); -return -ENOMEM ; - } -for (i =0 ; i < sdt_count; i++) sdt_entry[i].pa = (unsigned long ) mapped_xsdt->entry[i]; }
@@ -475,12 +470,6 @@ printk(KERN_WARNING PREFIX "Truncated %lu RSDT entries\n", (sdt_count - ACPI_MAX_TABLES)); sdt_count =ACPI_MAX_TABLES ; - } - - sdt_entry =alloc_bootmem (sdt_count *sizeof (struct acpi_table_sdt )); -if (!sdt_entry) { -printk (KERN_ERR "ACPI: Could not allocate mem for SDT entries!\n" ); -return -ENOMEM ; }for (i =0 ; i < sdt_count; i++)