diff --git a/[refs] b/[refs] index 39c4e95057a4..98fe6af17956 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8dca243eb1e7e97fb6bff60677e4bbae3f6f558 +refs/heads/master: 75e444606d88b877dfb1a57b0a0ae81ed5320922 diff --git a/trunk/drivers/acpi/acpica/utglobal.c b/trunk/drivers/acpi/acpica/utglobal.c index c083611c76a6..7b4dd21009e6 100644 --- a/trunk/drivers/acpi/acpica/utglobal.c +++ b/trunk/drivers/acpi/acpica/utglobal.c @@ -293,11 +293,11 @@ acpi_status acpi_ut_init_globals(void) /* GPE support */ + acpi_gbl_all_gpes_initialized = FALSE; acpi_gbl_gpe_xrupt_list_head = NULL; acpi_gbl_gpe_fadt_blocks[0] = NULL; acpi_gbl_gpe_fadt_blocks[1] = NULL; acpi_current_gpe_count = 0; - acpi_gbl_all_gpes_initialized = FALSE; acpi_gbl_global_event_handler = NULL; @@ -367,6 +367,7 @@ acpi_status acpi_ut_init_globals(void) #ifdef ACPI_DBG_TRACK_ALLOCATIONS acpi_gbl_display_final_mem_stats = FALSE; + acpi_gbl_disable_mem_tracking = FALSE; #endif return_ACPI_STATUS(AE_OK);