ACPICA: Additional 2016 copyright changes

[deliverable/linux.git] / drivers / acpi / acpica / utxfinit.c

diff --git a/drivers/acpi/acpica/utxfinit.c b/drivers/acpi/acpica/utxfinit.c
index 1c7ed4986963d999a2d9957ec9e99cbb9fd89792..721b87cce90865c8c3d20295b664cf2665de84b6 100644 (file)
--- a/drivers/acpi/acpica/utxfinit.c
+++ b/drivers/acpi/acpica/utxfinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -292,8 +292,14 @@ acpi_status __init acpi_initialize_objects(u32 flags)
         * outside of any control method is wrapped with a temporary control
         * method object and placed on a global list. The methods on this list
         * are executed below.
+        *
+        * This case executes the module-level code for all tables only after
+        * all of the tables have been loaded. It is a legacy option and is
+        * not compatible with other ACPI implementations. See acpi_ns_load_table.
         */
-       acpi_ns_exec_module_code_list();
+       if (acpi_gbl_group_module_level_code) {
+               acpi_ns_exec_module_code_list();
+       }
 
        /*
         * Initialize the objects that remain uninitialized. This runs the