Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (119 commits)
  ACPI: don't pass handle for fixed hardware notifications
  ACPI: remove null pointer checks in deferred execution path
  ACPI: simplify deferred execution path
  acerhdf: additional BIOS versions
  acerhdf: convert to dev_pm_ops
  acerhdf: fix fan control for AOA150 model
  thermal: add missing Kconfig dependency
  acpi: switch /proc/acpi/{debug_layer,debug_level} to seq_file
  hp-wmi: fix rfkill memory leak on unload
  ACPI: remove unnecessary #ifdef CONFIG_DMI
  ACPI: linux/acpi.h should not include linux/dmi.h
  hwmon driver for ACPI 4.0 power meters
  topstar-laptop: add new driver for hotkeys support on Topstar N01
  thinkpad_acpi: fix rfkill memory leak on unload
  thinkpad-acpi: report brightness events when required
  thinkpad-acpi: don't poll by default any of the reserved hotkeys
  thinkpad-acpi: Fix procfs hotkey reset command
  thinkpad-acpi: deprecate hotkey_bios_mask
  thinkpad-acpi: hotkey poll fixes
  thinkpad-acpi: be more strict when detecting a ThinkPad
  ...

1 files changed, 11 insertions, 4 deletions

diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c
index 14b8b8ed8023..567a4899a018 100644
--- a/drivers/acpi/acpica/dsmethod.c
+++ b/drivers/acpi/acpica/dsmethod.c
@@ -578,10 +578,15 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
                 }
 
                 /*
-                 * Delete any namespace objects created anywhere within
-                 * the namespace by the execution of this method
+                 * Delete any namespace objects created anywhere within the
+                 * namespace by the execution of this method. Unless this method
+                 * is a module-level executable code method, in which case we
+                 * want make the objects permanent.
                  */
-                acpi_ns_delete_namespace_by_owner(method_desc->method.owner_id);
+                if (!(method_desc->method.flags & AOPOBJ_MODULE_LEVEL)) {
+                        acpi_ns_delete_namespace_by_owner(method_desc->method.
+                                                          owner_id);
+                }
         }
 
         /* Decrement the thread count on the method */
@@ -622,7 +627,9 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
 
                 /* No more threads, we can free the owner_id */
 
-                acpi_ut_release_owner_id(&method_desc->method.owner_id);
+                if (!(method_desc->method.flags & AOPOBJ_MODULE_LEVEL)) {
+                        acpi_ut_release_owner_id(&method_desc->method.owner_id);
+                }
         }
 
         return_VOID;