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: (59 commits)
  ACPI / PM: Fix build problems for !CONFIG_ACPI related to NVS rework
  ACPI: fix resource check message
  ACPI / Battery: Update information on info notification and resume
  ACPI: Drop device flag wake_capable
  ACPI: Always check if _PRW is present before trying to evaluate it
  ACPI / PM: Check status of power resources under mutexes
  ACPI / PM: Rename acpi_power_off_device()
  ACPI / PM: Drop acpi_power_nocheck
  ACPI / PM: Drop acpi_bus_get_power()
  Platform / x86: Make fujitsu_laptop use acpi_bus_update_power()
  ACPI / Fan: Rework the handling of power resources
  ACPI / PM: Register power resource devices as soon as they are needed
  ACPI / PM: Register acpi_power_driver early
  ACPI / PM: Add function for updating device power state consistently
  ACPI / PM: Add function for device power state initialization
  ACPI / PM: Introduce __acpi_bus_get_power()
  ACPI / PM: Introduce function for refcounting device power resources
  ACPI / PM: Add functions for manipulating lists of power resources
  ACPI / PM: Prevent acpi_power_get_inferred_state() from making changes
  ACPICA: Update version to 20101209
  ...

1 files changed, 64 insertions, 13 deletions

diff --git a/drivers/acpi/acpica/evxface.c b/drivers/acpi/acpica/evxface.c
index 36af222cac6..1226689bdb1 100644
--- a/drivers/acpi/acpica/evxface.c
+++ b/drivers/acpi/acpica/evxface.c
@@ -92,6 +92,57 @@ acpi_status acpi_install_exception_handler(acpi_exception_handler handler)
 
 ACPI_EXPORT_SYMBOL(acpi_install_exception_handler)
 #endif                          /*  ACPI_FUTURE_USAGE  */
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_install_global_event_handler
+ *
+ * PARAMETERS:  Handler         - Pointer to the global event handler function
+ *              Context         - Value passed to the handler on each event
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Saves the pointer to the handler function. The global handler
+ *              is invoked upon each incoming GPE and Fixed Event. It is
+ *              invoked at interrupt level at the time of the event dispatch.
+ *              Can be used to update event counters, etc.
+ *
+ ******************************************************************************/
+acpi_status
+acpi_install_global_event_handler(ACPI_GBL_EVENT_HANDLER handler, void *context)
+{
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(acpi_install_global_event_handler);
+
+        /* Parameter validation */
+
+        if (!handler) {
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
+        }
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        /* Don't allow two handlers. */
+
+        if (acpi_gbl_global_event_handler) {
+                status = AE_ALREADY_EXISTS;
+                goto cleanup;
+        }
+
+        acpi_gbl_global_event_handler = handler;
+        acpi_gbl_global_event_handler_context = context;
+
+      cleanup:
+        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
+        return_ACPI_STATUS(status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_install_global_event_handler)
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_install_fixed_event_handler
@@ -671,10 +722,10 @@ ACPI_EXPORT_SYMBOL(acpi_remove_notify_handler)
 acpi_status
 acpi_install_gpe_handler(acpi_handle gpe_device,
                          u32 gpe_number,
-                         u32 type, acpi_event_handler address, void *context)
+                         u32 type, acpi_gpe_handler address, void *context)
 {
         struct acpi_gpe_event_info *gpe_event_info;
-        struct acpi_handler_info *handler;
+        struct acpi_gpe_handler_info *handler;
         acpi_status status;
         acpi_cpu_flags flags;
 
@@ -693,7 +744,7 @@ acpi_install_gpe_handler(acpi_handle gpe_device,
 
         /* Allocate memory for the handler object */
 
-        handler = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_handler_info));
+        handler = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_gpe_handler_info));
         if (!handler) {
                 status = AE_NO_MEMORY;
                 goto unlock_and_exit;
@@ -722,7 +773,7 @@ acpi_install_gpe_handler(acpi_handle gpe_device,
         handler->address = address;
         handler->context = context;
         handler->method_node = gpe_event_info->dispatch.method_node;
-        handler->orig_flags = gpe_event_info->flags &
+        handler->original_flags = gpe_event_info->flags &
                         (ACPI_GPE_XRUPT_TYPE_MASK | ACPI_GPE_DISPATCH_MASK);
 
         /*
@@ -731,10 +782,10 @@ acpi_install_gpe_handler(acpi_handle gpe_device,
          * disabled now to avoid spurious execution of the handler.
          */
 
-        if ((handler->orig_flags & ACPI_GPE_DISPATCH_METHOD)
+        if ((handler->original_flags & ACPI_GPE_DISPATCH_METHOD)
             && gpe_event_info->runtime_count) {
-                handler->orig_enabled = 1;
-                (void)acpi_raw_disable_gpe(gpe_event_info);
+                handler->originally_enabled = 1;
+                (void)acpi_ev_remove_gpe_reference(gpe_event_info);
         }
 
         /* Install the handler */
@@ -777,10 +828,10 @@ ACPI_EXPORT_SYMBOL(acpi_install_gpe_handler)
  ******************************************************************************/
 acpi_status
 acpi_remove_gpe_handler(acpi_handle gpe_device,
-                        u32 gpe_number, acpi_event_handler address)
+                        u32 gpe_number, acpi_gpe_handler address)
 {
         struct acpi_gpe_event_info *gpe_event_info;
-        struct acpi_handler_info *handler;
+        struct acpi_gpe_handler_info *handler;
         acpi_status status;
         acpi_cpu_flags flags;
 
@@ -835,7 +886,7 @@ acpi_remove_gpe_handler(acpi_handle gpe_device,
         gpe_event_info->dispatch.method_node = handler->method_node;
         gpe_event_info->flags &=
                 ~(ACPI_GPE_XRUPT_TYPE_MASK | ACPI_GPE_DISPATCH_MASK);
-        gpe_event_info->flags |= handler->orig_flags;
+        gpe_event_info->flags |= handler->original_flags;
 
         /*
          * If the GPE was previously associated with a method and it was
@@ -843,9 +894,9 @@ acpi_remove_gpe_handler(acpi_handle gpe_device,
          * post-initialization configuration.
          */
 
-        if ((handler->orig_flags & ACPI_GPE_DISPATCH_METHOD)
-            && handler->orig_enabled)
-                (void)acpi_raw_enable_gpe(gpe_event_info);
+        if ((handler->original_flags & ACPI_GPE_DISPATCH_METHOD)
+            && handler->originally_enabled)
+                (void)acpi_ev_add_gpe_reference(gpe_event_info);
 
         /* Now we can free the handler object */