]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
Merge branch 'gpe-regression-fixes' into release
authorLen Brown <len.brown@intel.com>
Sat, 12 Jun 2010 04:51:49 +0000 (00:51 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 12 Jun 2010 04:51:49 +0000 (00:51 -0400)
1  2 
drivers/acpi/acpica/acevents.h
drivers/acpi/acpica/evgpe.c
drivers/acpi/acpica/evgpeblk.c
drivers/acpi/acpica/evxfevnt.c
drivers/acpi/system.c
include/acpi/actypes.h

index 64d1e5c2d4ae694d3fb863803521fa965ba1e07e,138bbb52193011be9b66dd46fa920df612c4a5f2..c3f43daa8be3b84fa33e411f8240fd4e47c87ba5
@@@ -73,17 -73,11 +73,13 @@@ acpi_ev_queue_notify_request(struct acp
                             u32 notify_value);
  
  /*
 - * evgpe - GPE handling and dispatch
 + * evgpe - Low-level GPE support
   */
 +u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info *gpe_xrupt_list);
 +
  acpi_status
  acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info);
  
- acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info);
- acpi_status acpi_ev_disable_gpe(struct acpi_gpe_event_info *gpe_event_info);
  struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device,
                                                       u32 gpe_number);
  
@@@ -92,8 -86,18 +88,8 @@@ struct acpi_gpe_event_info *acpi_ev_low
                                                     *gpe_block);
  
  /*
 - * evgpeblk
 + * evgpeblk - Upper-level GPE block support
   */
 -u8 acpi_ev_valid_gpe_event(struct acpi_gpe_event_info *gpe_event_info);
 -
 -acpi_status
 -acpi_ev_walk_gpe_list(acpi_gpe_callback gpe_walk_callback, void *context);
 -
 -acpi_status
 -acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
 -                          struct acpi_gpe_block_info *gpe_block,
 -                          void *context);
 -
  acpi_status
  acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
                         struct acpi_generic_address *gpe_block_address,
@@@ -112,38 -116,10 +108,38 @@@ u3
  acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info,
                     u32 gpe_number);
  
 -u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info *gpe_xrupt_list);
 -
 +/*
 + * evgpeinit - GPE initialization and update
 + */
  acpi_status acpi_ev_gpe_initialize(void);
  
 +void acpi_ev_update_gpes(acpi_owner_id table_owner_id);
 +
 +acpi_status
 +acpi_ev_match_gpe_method(acpi_handle obj_handle,
 +                       u32 level, void *context, void **return_value);
 +
 +acpi_status
 +acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,
 +                        u32 level, void *context, void **return_value);
 +
 +/*
 + * evgpeutil - GPE utilities
 + */
 +acpi_status
 +acpi_ev_walk_gpe_list(acpi_gpe_callback gpe_walk_callback, void *context);
 +
 +u8 acpi_ev_valid_gpe_event(struct acpi_gpe_event_info *gpe_event_info);
 +
 +struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32 interrupt_number);
 +
 +acpi_status acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt);
 +
 +acpi_status
 +acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
 +                          struct acpi_gpe_block_info *gpe_block,
 +                          void *context);
 +
  /*
   * evregion - Address Space handling
   */
index a221ad404167158fe679adc27dd3872156f3b9fd,66cd03835d6e79d07be4ff47d27c85ae9c3ecf30..7c2c336006a1f316e280e990876eb6ffcd2f0e1f
@@@ -69,7 -69,7 +69,7 @@@ acpi_statu
  acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info)
  {
        struct acpi_gpe_register_info *gpe_register_info;
-       u8 register_bit;
+       u32 register_bit;
  
        ACPI_FUNCTION_TRACE(ev_update_gpe_enable_masks);
  
@@@ -78,9 -78,8 +78,8 @@@
                return_ACPI_STATUS(AE_NOT_EXIST);
        }
  
-       register_bit = (u8)
-           (1 <<
-            (gpe_event_info->gpe_number - gpe_register_info->base_gpe_number));
+       register_bit = acpi_hw_gpe_register_bit(gpe_event_info,
+                                               gpe_register_info);
  
        /* Clear the wake/run bits up front */
  
        return_ACPI_STATUS(AE_OK);
  }
  
- /*******************************************************************************
-  *
-  * FUNCTION:    acpi_ev_enable_gpe
-  *
-  * PARAMETERS:  gpe_event_info          - GPE to enable
-  *
-  * RETURN:      Status
-  *
-  * DESCRIPTION: Hardware-enable a GPE. Always enables the GPE, regardless
-  *              of type or number of references.
-  *
-  * Note: The GPE lock should be already acquired when this function is called.
-  *
-  ******************************************************************************/
- acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
- {
-       acpi_status status;
-       ACPI_FUNCTION_TRACE(ev_enable_gpe);
-       /*
-        * We will only allow a GPE to be enabled if it has either an
-        * associated method (_Lxx/_Exx) or a handler. Otherwise, the
-        * GPE will be immediately disabled by acpi_ev_gpe_dispatch the
-        * first time it fires.
-        */
-       if (!(gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK)) {
-               return_ACPI_STATUS(AE_NO_HANDLER);
-       }
-       /* Ensure the HW enable masks are current */
-       status = acpi_ev_update_gpe_enable_masks(gpe_event_info);
-       if (ACPI_FAILURE(status)) {
-               return_ACPI_STATUS(status);
-       }
-       /* Clear the GPE (of stale events) */
-       status = acpi_hw_clear_gpe(gpe_event_info);
-       if (ACPI_FAILURE(status)) {
-               return_ACPI_STATUS(status);
-       }
-       /* Enable the requested GPE */
-       status = acpi_hw_write_gpe_enable_reg(gpe_event_info);
-       return_ACPI_STATUS(status);
- }
- /*******************************************************************************
-  *
-  * FUNCTION:    acpi_ev_disable_gpe
-  *
-  * PARAMETERS:  gpe_event_info          - GPE to disable
-  *
-  * RETURN:      Status
-  *
-  * DESCRIPTION: Hardware-disable a GPE. Always disables the requested GPE,
-  *              regardless of the type or number of references.
-  *
-  * Note: The GPE lock should be already acquired when this function is called.
-  *
-  ******************************************************************************/
- acpi_status acpi_ev_disable_gpe(struct acpi_gpe_event_info *gpe_event_info)
- {
-       acpi_status status;
-       ACPI_FUNCTION_TRACE(ev_disable_gpe);
-       /*
-        * Note: Always disable the GPE, even if we think that that it is already
-        * disabled. It is possible that the AML or some other code has enabled
-        * the GPE behind our back.
-        */
-       /* Ensure the HW enable masks are current */
-       status = acpi_ev_update_gpe_enable_masks(gpe_event_info);
-       if (ACPI_FAILURE(status)) {
-               return_ACPI_STATUS(status);
-       }
-       /*
-        * Always H/W disable this GPE, even if we don't know the GPE type.
-        * Simply clear the enable bit for this particular GPE, but do not
-        * write out the current GPE enable mask since this may inadvertently
-        * enable GPEs too early. An example is a rogue GPE that has arrived
-        * during ACPICA initialization - possibly because AML or other code
-        * has enabled the GPE.
-        */
-       status = acpi_hw_low_disable_gpe(gpe_event_info);
-       return_ACPI_STATUS(status);
- }
  
  /*******************************************************************************
   *
@@@ -265,7 -164,7 +164,7 @@@ struct acpi_gpe_event_info *acpi_ev_get
  
        ACPI_FUNCTION_ENTRY();
  
 -      /* A NULL gpe_block means use the FADT-defined GPE block(s) */
 +      /* A NULL gpe_device means use the FADT-defined GPE block(s) */
  
        if (!gpe_device) {
  
@@@ -451,10 -350,6 +350,6 @@@ static void ACPI_SYSTEM_XFACE acpi_ev_a
                return_VOID;
        }
  
-       /* Update the GPE register masks for return to enabled state */
-       (void)acpi_ev_update_gpe_enable_masks(gpe_event_info);
        /*
         * Take a snapshot of the GPE info for this level - we copy the info to
         * prevent a race condition with remove_handler/remove_block.
@@@ -607,7 -502,7 +502,7 @@@ acpi_ev_gpe_dispatch(struct acpi_gpe_ev
                 * Disable the GPE, so it doesn't keep firing before the method has a
                 * chance to run (it runs asynchronously with interrupts enabled).
                 */
-               status = acpi_ev_disable_gpe(gpe_event_info);
+               status = acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_DISABLE);
                if (ACPI_FAILURE(status)) {
                        ACPI_EXCEPTION((AE_INFO, status,
                                        "Unable to disable GPE[0x%2X]",
                 * Disable the GPE. The GPE will remain disabled a handler
                 * is installed or ACPICA is restarted.
                 */
-               status = acpi_ev_disable_gpe(gpe_event_info);
+               status = acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_DISABLE);
                if (ACPI_FAILURE(status)) {
                        ACPI_EXCEPTION((AE_INFO, status,
                                        "Unable to disable GPE[0x%2X]",
index 7c28f2d9fd35015189de8e13f54579b10814ec2f,79048de0aded9a04d62f947c98ff13d4f319ea7b..341a38ce8aa6ce34e2e5a6c8653d6067ba9921d9
  ACPI_MODULE_NAME("evgpeblk")
  
  /* Local prototypes */
 -static acpi_status
 -acpi_ev_match_gpe_method(acpi_handle obj_handle,
 -                       u32 level, void *obj_desc, void **return_value);
 -
 -static acpi_status
 -acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,
 -                        u32 level, void *info, void **return_value);
 -
 -static struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32
 -                                                             interrupt_number);
 -
 -static acpi_status
 -acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt);
 -
  static acpi_status
  acpi_ev_install_gpe_block(struct acpi_gpe_block_info *gpe_block,
                          u32 interrupt_number);
  static acpi_status
  acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block);
  
 -/*******************************************************************************
 - *
 - * FUNCTION:    acpi_ev_valid_gpe_event
 - *
 - * PARAMETERS:  gpe_event_info              - Info for this GPE
 - *
 - * RETURN:      TRUE if the gpe_event is valid
 - *
 - * DESCRIPTION: Validate a GPE event. DO NOT CALL FROM INTERRUPT LEVEL.
 - *              Should be called only when the GPE lists are semaphore locked
 - *              and not subject to change.
 - *
 - ******************************************************************************/
 -
 -u8 acpi_ev_valid_gpe_event(struct acpi_gpe_event_info *gpe_event_info)
 -{
 -      struct acpi_gpe_xrupt_info *gpe_xrupt_block;
 -      struct acpi_gpe_block_info *gpe_block;
 -
 -      ACPI_FUNCTION_ENTRY();
 -
 -      /* No need for spin lock since we are not changing any list elements */
 -
 -      /* Walk the GPE interrupt levels */
 -
 -      gpe_xrupt_block = acpi_gbl_gpe_xrupt_list_head;
 -      while (gpe_xrupt_block) {
 -              gpe_block = gpe_xrupt_block->gpe_block_list_head;
 -
 -              /* Walk the GPE blocks on this interrupt level */
 -
 -              while (gpe_block) {
 -                      if ((&gpe_block->event_info[0] <= gpe_event_info) &&
 -                          (&gpe_block->event_info[gpe_block->gpe_count] >
 -                           gpe_event_info)) {
 -                              return (TRUE);
 -                      }
 -
 -                      gpe_block = gpe_block->next;
 -              }
 -
 -              gpe_xrupt_block = gpe_xrupt_block->next;
 -      }
 -
 -      return (FALSE);
 -}
 -
 -/*******************************************************************************
 - *
 - * FUNCTION:    acpi_ev_walk_gpe_list
 - *
 - * PARAMETERS:  gpe_walk_callback   - Routine called for each GPE block
 - *              Context             - Value passed to callback
 - *
 - * RETURN:      Status
 - *
 - * DESCRIPTION: Walk the GPE lists.
 - *
 - ******************************************************************************/
 -
 -acpi_status
 -acpi_ev_walk_gpe_list(acpi_gpe_callback gpe_walk_callback, void *context)
 -{
 -      struct acpi_gpe_block_info *gpe_block;
 -      struct acpi_gpe_xrupt_info *gpe_xrupt_info;
 -      acpi_status status = AE_OK;
 -      acpi_cpu_flags flags;
 -
 -      ACPI_FUNCTION_TRACE(ev_walk_gpe_list);
 -
 -      flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
 -
 -      /* Walk the interrupt level descriptor list */
 -
 -      gpe_xrupt_info = acpi_gbl_gpe_xrupt_list_head;
 -      while (gpe_xrupt_info) {
 -
 -              /* Walk all Gpe Blocks attached to this interrupt level */
 -
 -              gpe_block = gpe_xrupt_info->gpe_block_list_head;
 -              while (gpe_block) {
 -
 -                      /* One callback per GPE block */
 -
 -                      status =
 -                          gpe_walk_callback(gpe_xrupt_info, gpe_block,
 -                                            context);
 -                      if (ACPI_FAILURE(status)) {
 -                              if (status == AE_CTRL_END) {    /* Callback abort */
 -                                      status = AE_OK;
 -                              }
 -                              goto unlock_and_exit;
 -                      }
 -
 -                      gpe_block = gpe_block->next;
 -              }
 -
 -              gpe_xrupt_info = gpe_xrupt_info->next;
 -      }
 -
 -      unlock_and_exit:
 -      acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
 -      return_ACPI_STATUS(status);
 -}
 -
 -/*******************************************************************************
 - *
 - * FUNCTION:    acpi_ev_delete_gpe_handlers
 - *
 - * PARAMETERS:  gpe_xrupt_info      - GPE Interrupt info
 - *              gpe_block           - Gpe Block info
 - *
 - * RETURN:      Status
 - *
 - * DESCRIPTION: Delete all Handler objects found in the GPE data structs.
 - *              Used only prior to termination.
 - *
 - ******************************************************************************/
 -
 -acpi_status
 -acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
 -                          struct acpi_gpe_block_info *gpe_block,
 -                          void *context)
 -{
 -      struct acpi_gpe_event_info *gpe_event_info;
 -      u32 i;
 -      u32 j;
 -
 -      ACPI_FUNCTION_TRACE(ev_delete_gpe_handlers);
 -
 -      /* Examine each GPE Register within the block */
 -
 -      for (i = 0; i < gpe_block->register_count; i++) {
 -
 -              /* Now look at the individual GPEs in this byte register */
 -
 -              for (j = 0; j < ACPI_GPE_REGISTER_WIDTH; j++) {
 -                      gpe_event_info = &gpe_block->event_info[((acpi_size) i *
 -                                                               ACPI_GPE_REGISTER_WIDTH)
 -                                                              + j];
 -
 -                      if ((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
 -                          ACPI_GPE_DISPATCH_HANDLER) {
 -                              ACPI_FREE(gpe_event_info->dispatch.handler);
 -                              gpe_event_info->dispatch.handler = NULL;
 -                              gpe_event_info->flags &=
 -                                  ~ACPI_GPE_DISPATCH_MASK;
 -                      }
 -              }
 -      }
 -
 -      return_ACPI_STATUS(AE_OK);
 -}
 -
 -/*******************************************************************************
 - *
 - * FUNCTION:    acpi_ev_match_gpe_method
 - *
 - * PARAMETERS:  Callback from walk_namespace
 - *
 - * RETURN:      Status
 - *
 - * DESCRIPTION: Called from acpi_walk_namespace. Expects each object to be a
 - *              control method under the _GPE portion of the namespace.
 - *              Extract the name and GPE type from the object, saving this
 - *              information for quick lookup during GPE dispatch
 - *
 - *              The name of each GPE control method is of the form:
 - *              "_Lxx" or "_Exx", where:
 - *                  L      - means that the GPE is level triggered
 - *                  E      - means that the GPE is edge triggered
 - *                  xx     - is the GPE number [in HEX]
 - *
 - ******************************************************************************/
 -
 -static acpi_status
 -acpi_ev_match_gpe_method(acpi_handle obj_handle,
 -                       u32 level, void *obj_desc, void **return_value)
 -{
 -      struct acpi_namespace_node *method_node =
 -          ACPI_CAST_PTR(struct acpi_namespace_node, obj_handle);
 -      struct acpi_gpe_block_info *gpe_block = (void *)obj_desc;
 -      struct acpi_gpe_event_info *gpe_event_info;
 -      u32 gpe_number;
 -      char name[ACPI_NAME_SIZE + 1];
 -      u8 type;
 -
 -      ACPI_FUNCTION_TRACE(ev_save_method_info);
 -
 -      /*
 -       * Match and decode the _Lxx and _Exx GPE method names
 -       *
 -       * 1) Extract the method name and null terminate it
 -       */
 -      ACPI_MOVE_32_TO_32(name, &method_node->name.integer);
 -      name[ACPI_NAME_SIZE] = 0;
 -
 -      /* 2) Name must begin with an underscore */
 -
 -      if (name[0] != '_') {
 -              return_ACPI_STATUS(AE_OK);      /* Ignore this method */
 -      }
 -
 -      /*
 -       * 3) Edge/Level determination is based on the 2nd character
 -       *    of the method name
 -       *
 -       * NOTE: Default GPE type is RUNTIME only. Later, if a _PRW object is
 -       * found that points to this GPE, the ACPI_GPE_CAN_WAKE flag is set.
 -       */
 -      switch (name[1]) {
 -      case 'L':
 -              type = ACPI_GPE_LEVEL_TRIGGERED;
 -              break;
 -
 -      case 'E':
 -              type = ACPI_GPE_EDGE_TRIGGERED;
 -              break;
 -
 -      default:
 -              /* Unknown method type, just ignore it */
 -
 -              ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
 -                                "Ignoring unknown GPE method type: %s "
 -                                "(name not of form _Lxx or _Exx)", name));
 -              return_ACPI_STATUS(AE_OK);
 -      }
 -
 -      /* 4) The last two characters of the name are the hex GPE Number */
 -
 -      gpe_number = ACPI_STRTOUL(&name[2], NULL, 16);
 -      if (gpe_number == ACPI_UINT32_MAX) {
 -
 -              /* Conversion failed; invalid method, just ignore it */
 -
 -              ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
 -                                "Could not extract GPE number from name: %s "
 -                                "(name is not of form _Lxx or _Exx)", name));
 -              return_ACPI_STATUS(AE_OK);
 -      }
 -
 -      /* Ensure that we have a valid GPE number for this GPE block */
 -
 -      gpe_event_info = acpi_ev_low_get_gpe_info(gpe_number, gpe_block);
 -      if (!gpe_event_info) {
 -              /*
 -               * This gpe_number is not valid for this GPE block, just ignore it.
 -               * However, it may be valid for a different GPE block, since GPE0
 -               * and GPE1 methods both appear under \_GPE.
 -               */
 -              return_ACPI_STATUS(AE_OK);
 -      }
 -
 -      /*
 -       * Add the GPE information from above to the gpe_event_info block for
 -       * use during dispatch of this GPE.
 -       */
 -      gpe_event_info->flags = (u8)(type | ACPI_GPE_DISPATCH_METHOD);
 -      gpe_event_info->dispatch.method_node = method_node;
 -
 -      ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
 -                        "Registered GPE method %s as GPE number 0x%.2X\n",
 -                        name, gpe_number));
 -      return_ACPI_STATUS(AE_OK);
 -}
 -
 -/*******************************************************************************
 - *
 - * FUNCTION:    acpi_ev_match_prw_and_gpe
 - *
 - * PARAMETERS:  Callback from walk_namespace
 - *
 - * RETURN:      Status. NOTE: We ignore errors so that the _PRW walk is
 - *              not aborted on a single _PRW failure.
 - *
 - * DESCRIPTION: Called from acpi_walk_namespace. Expects each object to be a
 - *              Device. Run the _PRW method. If present, extract the GPE
 - *              number and mark the GPE as a CAN_WAKE GPE.
 - *
 - ******************************************************************************/
 -
 -static acpi_status
 -acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,
 -                        u32 level, void *info, void **return_value)
 -{
 -      struct acpi_gpe_walk_info *gpe_info = (void *)info;
 -      struct acpi_namespace_node *gpe_device;
 -      struct acpi_gpe_block_info *gpe_block;
 -      struct acpi_namespace_node *target_gpe_device;
 -      struct acpi_gpe_event_info *gpe_event_info;
 -      union acpi_operand_object *pkg_desc;
 -      union acpi_operand_object *obj_desc;
 -      u32 gpe_number;
 -      acpi_status status;
 -
 -      ACPI_FUNCTION_TRACE(ev_match_prw_and_gpe);
 -
 -      /* Check for a _PRW method under this device */
 -
 -      status = acpi_ut_evaluate_object(obj_handle, METHOD_NAME__PRW,
 -                                       ACPI_BTYPE_PACKAGE, &pkg_desc);
 -      if (ACPI_FAILURE(status)) {
 -
 -              /* Ignore all errors from _PRW, we don't want to abort the walk */
 -
 -              return_ACPI_STATUS(AE_OK);
 -      }
 -
 -      /* The returned _PRW package must have at least two elements */
 -
 -      if (pkg_desc->package.count < 2) {
 -              goto cleanup;
 -      }
 -
 -      /* Extract pointers from the input context */
 -
 -      gpe_device = gpe_info->gpe_device;
 -      gpe_block = gpe_info->gpe_block;
 -
 -      /*
 -       * The _PRW object must return a package, we are only interested in the
 -       * first element
 -       */
 -      obj_desc = pkg_desc->package.elements[0];
 -
 -      if (obj_desc->common.type == ACPI_TYPE_INTEGER) {
 -
 -              /* Use FADT-defined GPE device (from definition of _PRW) */
 -
 -              target_gpe_device = acpi_gbl_fadt_gpe_device;
 -
 -              /* Integer is the GPE number in the FADT described GPE blocks */
 -
 -              gpe_number = (u32) obj_desc->integer.value;
 -      } else if (obj_desc->common.type == ACPI_TYPE_PACKAGE) {
 -
 -              /* Package contains a GPE reference and GPE number within a GPE block */
 -
 -              if ((obj_desc->package.count < 2) ||
 -                  ((obj_desc->package.elements[0])->common.type !=
 -                   ACPI_TYPE_LOCAL_REFERENCE) ||
 -                  ((obj_desc->package.elements[1])->common.type !=
 -                   ACPI_TYPE_INTEGER)) {
 -                      goto cleanup;
 -              }
 -
 -              /* Get GPE block reference and decode */
 -
 -              target_gpe_device =
 -                  obj_desc->package.elements[0]->reference.node;
 -              gpe_number = (u32) obj_desc->package.elements[1]->integer.value;
 -      } else {
 -              /* Unknown type, just ignore it */
 -
 -              goto cleanup;
 -      }
 -
 -      /*
 -       * Is this GPE within this block?
 -       *
 -       * TRUE if and only if these conditions are true:
 -       *     1) The GPE devices match.
 -       *     2) The GPE index(number) is within the range of the Gpe Block
 -       *          associated with the GPE device.
 -       */
 -      if (gpe_device != target_gpe_device) {
 -              goto cleanup;
 -      }
 -
 -      gpe_event_info = acpi_ev_low_get_gpe_info(gpe_number, gpe_block);
 -      if (gpe_event_info) {
 -              /* This GPE can wake the system */
 -
 -              gpe_event_info->flags |= ACPI_GPE_CAN_WAKE;
 -      }
 -
 -      cleanup:
 -      acpi_ut_remove_reference(pkg_desc);
 -      return_ACPI_STATUS(AE_OK);
 -}
 -
 -/*******************************************************************************
 - *
 - * FUNCTION:    acpi_ev_get_gpe_xrupt_block
 - *
 - * PARAMETERS:  interrupt_number     - Interrupt for a GPE block
 - *
 - * RETURN:      A GPE interrupt block
 - *
 - * DESCRIPTION: Get or Create a GPE interrupt block. There is one interrupt
 - *              block per unique interrupt level used for GPEs. Should be
 - *              called only when the GPE lists are semaphore locked and not
 - *              subject to change.
 - *
 - ******************************************************************************/
 -
 -static struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32
 -                                                             interrupt_number)
 -{
 -      struct acpi_gpe_xrupt_info *next_gpe_xrupt;
 -      struct acpi_gpe_xrupt_info *gpe_xrupt;
 -      acpi_status status;
 -      acpi_cpu_flags flags;
 -
 -      ACPI_FUNCTION_TRACE(ev_get_gpe_xrupt_block);
 -
 -      /* No need for lock since we are not changing any list elements here */
 -
 -      next_gpe_xrupt = acpi_gbl_gpe_xrupt_list_head;
 -      while (next_gpe_xrupt) {
 -              if (next_gpe_xrupt->interrupt_number == interrupt_number) {
 -                      return_PTR(next_gpe_xrupt);
 -              }
 -
 -              next_gpe_xrupt = next_gpe_xrupt->next;
 -      }
 -
 -      /* Not found, must allocate a new xrupt descriptor */
 -
 -      gpe_xrupt = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_gpe_xrupt_info));
 -      if (!gpe_xrupt) {
 -              return_PTR(NULL);
 -      }
 -
 -      gpe_xrupt->interrupt_number = interrupt_number;
 -
 -      /* Install new interrupt descriptor with spin lock */
 -
 -      flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
 -      if (acpi_gbl_gpe_xrupt_list_head) {
 -              next_gpe_xrupt = acpi_gbl_gpe_xrupt_list_head;
 -              while (next_gpe_xrupt->next) {
 -                      next_gpe_xrupt = next_gpe_xrupt->next;
 -              }
 -
 -              next_gpe_xrupt->next = gpe_xrupt;
 -              gpe_xrupt->previous = next_gpe_xrupt;
 -      } else {
 -              acpi_gbl_gpe_xrupt_list_head = gpe_xrupt;
 -      }
 -      acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
 -
 -      /* Install new interrupt handler if not SCI_INT */
 -
 -      if (interrupt_number != acpi_gbl_FADT.sci_interrupt) {
 -              status = acpi_os_install_interrupt_handler(interrupt_number,
 -                                                         acpi_ev_gpe_xrupt_handler,
 -                                                         gpe_xrupt);
 -              if (ACPI_FAILURE(status)) {
 -                      ACPI_ERROR((AE_INFO,
 -                                  "Could not install GPE interrupt handler at level 0x%X",
 -                                  interrupt_number));
 -                      return_PTR(NULL);
 -              }
 -      }
 -
 -      return_PTR(gpe_xrupt);
 -}
 -
 -/*******************************************************************************
 - *
 - * FUNCTION:    acpi_ev_delete_gpe_xrupt
 - *
 - * PARAMETERS:  gpe_xrupt       - A GPE interrupt info block
 - *
 - * RETURN:      Status
 - *
 - * DESCRIPTION: Remove and free a gpe_xrupt block. Remove an associated
 - *              interrupt handler if not the SCI interrupt.
 - *
 - ******************************************************************************/
 -
 -static acpi_status
 -acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt)
 -{
 -      acpi_status status;
 -      acpi_cpu_flags flags;
 -
 -      ACPI_FUNCTION_TRACE(ev_delete_gpe_xrupt);
 -
 -      /* We never want to remove the SCI interrupt handler */
 -
 -      if (gpe_xrupt->interrupt_number == acpi_gbl_FADT.sci_interrupt) {
 -              gpe_xrupt->gpe_block_list_head = NULL;
 -              return_ACPI_STATUS(AE_OK);
 -      }
 -
 -      /* Disable this interrupt */
 -
 -      status =
 -          acpi_os_remove_interrupt_handler(gpe_xrupt->interrupt_number,
 -                                           acpi_ev_gpe_xrupt_handler);
 -      if (ACPI_FAILURE(status)) {
 -              return_ACPI_STATUS(status);
 -      }
 -
 -      /* Unlink the interrupt block with lock */
 -
 -      flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
 -      if (gpe_xrupt->previous) {
 -              gpe_xrupt->previous->next = gpe_xrupt->next;
 -      } else {
 -              /* No previous, update list head */
 -
 -              acpi_gbl_gpe_xrupt_list_head = gpe_xrupt->next;
 -      }
 -
 -      if (gpe_xrupt->next) {
 -              gpe_xrupt->next->previous = gpe_xrupt->previous;
 -      }
 -      acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
 -
 -      /* Free the block */
 -
 -      ACPI_FREE(gpe_xrupt);
 -      return_ACPI_STATUS(AE_OK);
 -}
 -
  /*******************************************************************************
   *
   * FUNCTION:    acpi_ev_install_gpe_block
@@@ -342,7 -874,6 +342,7 @@@ acpi_ev_create_gpe_block(struct acpi_na
  {
        acpi_status status;
        struct acpi_gpe_block_info *gpe_block;
 +      struct acpi_gpe_walk_info walk_info;
  
        ACPI_FUNCTION_TRACE(ev_create_gpe_block);
  
                return_ACPI_STATUS(status);
        }
  
 -      /* Find all GPE methods (_Lxx, _Exx) for this block */
 +      /* Find all GPE methods (_Lxx or_Exx) for this block */
 +
 +      walk_info.gpe_block = gpe_block;
 +      walk_info.gpe_device = gpe_device;
 +      walk_info.enable_this_gpe = FALSE;
 +      walk_info.execute_by_owner_id = FALSE;
  
        status = acpi_ns_walk_namespace(ACPI_TYPE_METHOD, gpe_device,
                                        ACPI_UINT32_MAX, ACPI_NS_WALK_NO_UNLOCK,
                                        acpi_ev_match_gpe_method, NULL,
 -                                      gpe_block, NULL);
 +                                      &walk_info, NULL);
  
        /* Return the new block */
  
@@@ -439,7 -965,7 +439,7 @@@ acpi_ev_initialize_gpe_block(struct acp
  {
        acpi_status status;
        struct acpi_gpe_event_info *gpe_event_info;
 -      struct acpi_gpe_walk_info gpe_info;
 +      struct acpi_gpe_walk_info walk_info;
        u32 wake_gpe_count;
        u32 gpe_enabled_count;
        u32 gpe_index;
                 * definition a wake GPE and will not be enabled while the machine
                 * is running.
                 */
 -              gpe_info.gpe_block = gpe_block;
 -              gpe_info.gpe_device = gpe_device;
 +              walk_info.gpe_block = gpe_block;
 +              walk_info.gpe_device = gpe_device;
 +              walk_info.execute_by_owner_id = FALSE;
  
 -              status = acpi_ns_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
 +              status =
 +                  acpi_ns_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
                                           ACPI_UINT32_MAX, ACPI_NS_WALK_UNLOCK,
                                           acpi_ev_match_prw_and_gpe, NULL,
 -                                         &gpe_info, NULL);
 +                                         &walk_info, NULL);
                if (ACPI_FAILURE(status)) {
                        ACPI_EXCEPTION((AE_INFO, status,
                                        "While executing _PRW methods"));
  
                        gpe_index = (i * ACPI_GPE_REGISTER_WIDTH) + j;
                        gpe_event_info = &gpe_block->event_info[gpe_index];
+                       gpe_number = gpe_index + gpe_block->block_base_number;
+                       /*
+                        * If the GPE has already been enabled for runtime
+                        * signaling, make sure it remains enabled, but do not
+                        * increment its reference counter.
+                        */
+                       if (gpe_event_info->runtime_count) {
+                               acpi_set_gpe(gpe_device, gpe_number,
+                                               ACPI_GPE_ENABLE);
+                               gpe_enabled_count++;
+                               continue;
+                       }
  
                        if (gpe_event_info->flags & ACPI_GPE_CAN_WAKE) {
                                wake_gpe_count++;
  
                        /* Enable this GPE */
  
-                       gpe_number = gpe_index + gpe_block->block_base_number;
                        status = acpi_enable_gpe(gpe_device, gpe_number,
                                                 ACPI_GPE_TYPE_RUNTIME);
                        if (ACPI_FAILURE(status)) {
                }
        }
  
 -      ACPI_DEBUG_PRINT((ACPI_DB_INIT,
 -                        "Found %u Wake, Enabled %u Runtime GPEs in this block\n",
 -                        wake_gpe_count, gpe_enabled_count));
 -
 -      return_ACPI_STATUS(AE_OK);
 -}
 -
 -/*******************************************************************************
 - *
 - * FUNCTION:    acpi_ev_gpe_initialize
 - *
 - * PARAMETERS:  None
 - *
 - * RETURN:      Status
 - *
 - * DESCRIPTION: Initialize the GPE data structures
 - *
 - ******************************************************************************/
 -
 -acpi_status acpi_ev_gpe_initialize(void)
 -{
 -      u32 register_count0 = 0;
 -      u32 register_count1 = 0;
 -      u32 gpe_number_max = 0;
 -      acpi_status status;
 -
 -      ACPI_FUNCTION_TRACE(ev_gpe_initialize);
 -
 -      status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
 -      if (ACPI_FAILURE(status)) {
 -              return_ACPI_STATUS(status);
 -      }
 -
 -      /*
 -       * Initialize the GPE Block(s) defined in the FADT
 -       *
 -       * Why the GPE register block lengths are divided by 2:  From the ACPI
 -       * Spec, section "General-Purpose Event Registers", we have:
 -       *
 -       * "Each register block contains two registers of equal length
 -       *  GPEx_STS and GPEx_EN (where x is 0 or 1). The length of the
 -       *  GPE0_STS and GPE0_EN registers is equal to half the GPE0_LEN
 -       *  The length of the GPE1_STS and GPE1_EN registers is equal to
 -       *  half the GPE1_LEN. If a generic register block is not supported
 -       *  then its respective block pointer and block length values in the
 -       *  FADT table contain zeros. The GPE0_LEN and GPE1_LEN do not need
 -       *  to be the same size."
 -       */
 -
 -      /*
 -       * Determine the maximum GPE number for this machine.
 -       *
 -       * Note: both GPE0 and GPE1 are optional, and either can exist without
 -       * the other.
 -       *
 -       * If EITHER the register length OR the block address are zero, then that
 -       * particular block is not supported.
 -       */
 -      if (acpi_gbl_FADT.gpe0_block_length &&
 -          acpi_gbl_FADT.xgpe0_block.address) {
 -
 -              /* GPE block 0 exists (has both length and address > 0) */
 -
 -              register_count0 = (u16) (acpi_gbl_FADT.gpe0_block_length / 2);
 -
 -              gpe_number_max =
 -                  (register_count0 * ACPI_GPE_REGISTER_WIDTH) - 1;
 -
 -              /* Install GPE Block 0 */
 -
 -              status = acpi_ev_create_gpe_block(acpi_gbl_fadt_gpe_device,
 -                                                &acpi_gbl_FADT.xgpe0_block,
 -                                                register_count0, 0,
 -                                                acpi_gbl_FADT.sci_interrupt,
 -                                                &acpi_gbl_gpe_fadt_blocks[0]);
 -
 -              if (ACPI_FAILURE(status)) {
 -                      ACPI_EXCEPTION((AE_INFO, status,
 -                                      "Could not create GPE Block 0"));
 -              }
 -      }
 -
 -      if (acpi_gbl_FADT.gpe1_block_length &&
 -          acpi_gbl_FADT.xgpe1_block.address) {
 -
 -              /* GPE block 1 exists (has both length and address > 0) */
 -
 -              register_count1 = (u16) (acpi_gbl_FADT.gpe1_block_length / 2);
 -
 -              /* Check for GPE0/GPE1 overlap (if both banks exist) */
 -
 -              if ((register_count0) &&
 -                  (gpe_number_max >= acpi_gbl_FADT.gpe1_base)) {
 -                      ACPI_ERROR((AE_INFO,
 -                                  "GPE0 block (GPE 0 to %u) overlaps the GPE1 block "
 -                                  "(GPE %u to %u) - Ignoring GPE1",
 -                                  gpe_number_max, acpi_gbl_FADT.gpe1_base,
 -                                  acpi_gbl_FADT.gpe1_base +
 -                                  ((register_count1 *
 -                                    ACPI_GPE_REGISTER_WIDTH) - 1)));
 -
 -                      /* Ignore GPE1 block by setting the register count to zero */
 -
 -                      register_count1 = 0;
 -              } else {
 -                      /* Install GPE Block 1 */
 -
 -                      status =
 -                          acpi_ev_create_gpe_block(acpi_gbl_fadt_gpe_device,
 -                                                   &acpi_gbl_FADT.xgpe1_block,
 -                                                   register_count1,
 -                                                   acpi_gbl_FADT.gpe1_base,
 -                                                   acpi_gbl_FADT.
 -                                                   sci_interrupt,
 -                                                   &acpi_gbl_gpe_fadt_blocks
 -                                                   [1]);
 -
 -                      if (ACPI_FAILURE(status)) {
 -                              ACPI_EXCEPTION((AE_INFO, status,
 -                                              "Could not create GPE Block 1"));
 -                      }
 -
 -                      /*
 -                       * GPE0 and GPE1 do not have to be contiguous in the GPE number
 -                       * space. However, GPE0 always starts at GPE number zero.
 -                       */
 -                      gpe_number_max = acpi_gbl_FADT.gpe1_base +
 -                          ((register_count1 * ACPI_GPE_REGISTER_WIDTH) - 1);
 -              }
 -      }
 -
 -      /* Exit if there are no GPE registers */
 -
 -      if ((register_count0 + register_count1) == 0) {
 -
 -              /* GPEs are not required by ACPI, this is OK */
 -
 +      if (gpe_enabled_count || wake_gpe_count) {
                ACPI_DEBUG_PRINT((ACPI_DB_INIT,
 -                                "There are no GPE blocks defined in the FADT\n"));
 -              status = AE_OK;
 -              goto cleanup;
 -      }
 -
 -      /* Check for Max GPE number out-of-range */
 -
 -      if (gpe_number_max > ACPI_GPE_MAX) {
 -              ACPI_ERROR((AE_INFO,
 -                          "Maximum GPE number from FADT is too large: 0x%X",
 -                          gpe_number_max));
 -              status = AE_BAD_VALUE;
 -              goto cleanup;
 +                                "Enabled %u Runtime GPEs, added %u Wake GPEs in this block\n",
 +                                gpe_enabled_count, wake_gpe_count));
        }
  
 -      cleanup:
 -      (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
        return_ACPI_STATUS(AE_OK);
  }
index d5a5efc043bf7a43ac446c815370576deaa5b096,e3d9f5c8e53d92b5147afeccf8c764879c2ac6d2..d97b8dce16681ba90886a3b0e5546cf5b7060ce8
@@@ -69,7 -69,7 +69,7 @@@ acpi_ev_get_gpe_device(struct acpi_gpe_
  
  acpi_status acpi_enable(void)
  {
 -      acpi_status status = AE_OK;
 +      acpi_status status;
  
        ACPI_FUNCTION_TRACE(acpi_enable);
  
        if (acpi_hw_get_mode() == ACPI_SYS_MODE_ACPI) {
                ACPI_DEBUG_PRINT((ACPI_DB_INIT,
                                  "System is already in ACPI mode\n"));
 -      } else {
 -              /* Transition to ACPI mode */
 +              return_ACPI_STATUS(AE_OK);
 +      }
  
 -              status = acpi_hw_set_mode(ACPI_SYS_MODE_ACPI);
 -              if (ACPI_FAILURE(status)) {
 -                      ACPI_ERROR((AE_INFO,
 -                                  "Could not transition to ACPI mode"));
 -                      return_ACPI_STATUS(status);
 -              }
 +      /* Transition to ACPI mode */
  
 -              ACPI_DEBUG_PRINT((ACPI_DB_INIT,
 -                                "Transition to ACPI mode successful\n"));
 +      status = acpi_hw_set_mode(ACPI_SYS_MODE_ACPI);
 +      if (ACPI_FAILURE(status)) {
 +              ACPI_ERROR((AE_INFO,
 +                          "Could not transition to ACPI mode"));
 +              return_ACPI_STATUS(status);
        }
  
 -      return_ACPI_STATUS(status);
 +      /* Sanity check that transition succeeded */
 +
 +      if (acpi_hw_get_mode() != ACPI_SYS_MODE_ACPI) {
 +              ACPI_ERROR((AE_INFO,
 +                          "Hardware did not enter ACPI mode"));
 +              return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
 +      }
 +
 +      ACPI_DEBUG_PRINT((ACPI_DB_INIT,
 +                        "Transition to ACPI mode successful\n"));
 +
 +      return_ACPI_STATUS(AE_OK);
  }
  
  ACPI_EXPORT_SYMBOL(acpi_enable)
@@@ -208,6 -199,44 +208,44 @@@ acpi_status acpi_enable_event(u32 event
  
  ACPI_EXPORT_SYMBOL(acpi_enable_event)
  
+ /*******************************************************************************
+  *
+  * FUNCTION:    acpi_clear_and_enable_gpe
+  *
+  * PARAMETERS:  gpe_event_info  - GPE to enable
+  *
+  * RETURN:      Status
+  *
+  * DESCRIPTION: Clear the given GPE from stale events and enable it.
+  *
+  ******************************************************************************/
+ static acpi_status
+ acpi_clear_and_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
+ {
+       acpi_status status;
+       /*
+        * We will only allow a GPE to be enabled if it has either an
+        * associated method (_Lxx/_Exx) or a handler. Otherwise, the
+        * GPE will be immediately disabled by acpi_ev_gpe_dispatch the
+        * first time it fires.
+        */
+       if (!(gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK)) {
+               return_ACPI_STATUS(AE_NO_HANDLER);
+       }
+       /* Clear the GPE (of stale events) */
+       status = acpi_hw_clear_gpe(gpe_event_info);
+       if (ACPI_FAILURE(status)) {
+               return_ACPI_STATUS(status);
+       }
+       /* Enable the requested GPE */
+       status = acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_ENABLE);
+       return_ACPI_STATUS(status);
+ }
  /*******************************************************************************
   *
   * FUNCTION:    acpi_set_gpe
@@@ -249,11 -278,11 +287,11 @@@ acpi_status acpi_set_gpe(acpi_handle gp
  
        switch (action) {
        case ACPI_GPE_ENABLE:
-               status = acpi_ev_enable_gpe(gpe_event_info);
+               status = acpi_clear_and_enable_gpe(gpe_event_info);
                break;
  
        case ACPI_GPE_DISABLE:
-               status = acpi_ev_disable_gpe(gpe_event_info);
+               status = acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_DISABLE);
                break;
  
        default:
@@@ -316,7 -345,11 +354,11 @@@ acpi_status acpi_enable_gpe(acpi_handl
  
                gpe_event_info->runtime_count++;
                if (gpe_event_info->runtime_count == 1) {
-                       status = acpi_ev_enable_gpe(gpe_event_info);
+                       status = acpi_ev_update_gpe_enable_masks(gpe_event_info);
+                       if (ACPI_SUCCESS(status)) {
+                               status = acpi_clear_and_enable_gpe(gpe_event_info);
+                       }
                        if (ACPI_FAILURE(status)) {
                                gpe_event_info->runtime_count--;
                                goto unlock_and_exit;
                 */
                gpe_event_info->wakeup_count++;
                if (gpe_event_info->wakeup_count == 1) {
-                       (void)acpi_ev_update_gpe_enable_masks(gpe_event_info);
+                       status = acpi_ev_update_gpe_enable_masks(gpe_event_info);
                }
        }
  
@@@ -403,7 -436,12 +445,12 @@@ acpi_status acpi_disable_gpe(acpi_handl
  
                gpe_event_info->runtime_count--;
                if (!gpe_event_info->runtime_count) {
-                       status = acpi_ev_disable_gpe(gpe_event_info);
+                       status = acpi_ev_update_gpe_enable_masks(gpe_event_info);
+                       if (ACPI_SUCCESS(status)) {
+                               status = acpi_hw_low_set_gpe(gpe_event_info,
+                                                            ACPI_GPE_DISABLE);
+                       }
                        if (ACPI_FAILURE(status)) {
                                gpe_event_info->runtime_count++;
                                goto unlock_and_exit;
  
                gpe_event_info->wakeup_count--;
                if (!gpe_event_info->wakeup_count) {
-                       (void)acpi_ev_update_gpe_enable_masks(gpe_event_info);
+                       status = acpi_ev_update_gpe_enable_masks(gpe_event_info);
                }
        }
  
diff --combined drivers/acpi/system.c
index c79e789ed03ae39a1c771e80586a1460546672a5,904e8fce2e74c9fea5d96f72d0e5a65ebb1fdb46..f8db50a0941c286eaba3466869ab4ed4fea23452
@@@ -71,7 -71,7 +71,7 @@@ struct acpi_table_attr 
        struct list_head node;
  };
  
 -static ssize_t acpi_table_show(struct kobject *kobj,
 +static ssize_t acpi_table_show(struct file *filp, struct kobject *kobj,
                               struct bin_attribute *bin_attr, char *buf,
                               loff_t offset, size_t count)
  {
@@@ -388,10 -388,12 +388,12 @@@ static ssize_t counter_set(struct kobje
        if (index < num_gpes) {
                if (!strcmp(buf, "disable\n") &&
                                (status & ACPI_EVENT_FLAG_ENABLED))
-                       result = acpi_set_gpe(handle, index, ACPI_GPE_DISABLE);
+                       result = acpi_disable_gpe(handle, index,
+                                               ACPI_GPE_TYPE_RUNTIME);
                else if (!strcmp(buf, "enable\n") &&
                                !(status & ACPI_EVENT_FLAG_ENABLED))
-                       result = acpi_set_gpe(handle, index, ACPI_GPE_ENABLE);
+                       result = acpi_enable_gpe(handle, index,
+                                               ACPI_GPE_TYPE_RUNTIME);
                else if (!strcmp(buf, "clear\n") &&
                                (status & ACPI_EVENT_FLAG_SET))
                        result = acpi_clear_gpe(handle, index);
diff --combined include/acpi/actypes.h
index bade172cad47699882db544e7e057e3b35add502,15a4c68fad3b70eb6bfe96ada898841313221ecf..d55f4a7b824db550d3ce2bfbd2c7235859eb08a4
@@@ -663,10 -663,11 +663,11 @@@ typedef u32 acpi_event_status
  #define ACPI_GPE_MAX                    0xFF
  #define ACPI_NUM_GPE                    256
  
- /* Actions for acpi_set_gpe */
+ /* Actions for acpi_set_gpe and acpi_hw_low_set_gpe */
  
  #define ACPI_GPE_ENABLE                 0
  #define ACPI_GPE_DISABLE                1
+ #define ACPI_GPE_COND_ENABLE            2
  
  /* gpe_types for acpi_enable_gpe and acpi_disable_gpe */
  
@@@ -951,7 -952,7 +952,7 @@@ acpi_status(*acpi_adr_space_setup) (acp
  #define ACPI_REGION_DEACTIVATE  1
  
  typedef
 -acpi_status(*acpi_walk_callback) (acpi_handle obj_handle,
 +acpi_status(*acpi_walk_callback) (acpi_handle object,
                                  u32 nesting_level,
                                  void *context, void **return_value);