Merge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next

* 'intel/drm-intel-next' of ../drm-next: (755 commits)
  drm/i915: Only wait on a pending flip if we intend to write to the buffer
  drm/i915/dp: Sanity check eDP existence
  drm/i915: Rebind the buffer if its alignment constraints changes with tiling
  drm/i915: Disable GPU semaphores by default
  drm/i915: Do not overflow the MMADDR write FIFO
  Revert "drm/i915: fix corruptions on i8xx due to relaxed fencing"
  drm/i915: Don't save/restore hardware status page address register
  drm/i915: don't store the reg value for HWS_PGA
  drm/i915: fix memory corruption with GM965 and >4GB RAM
  Linux 2.6.38-rc7
  Revert "TPM: Long default timeout fix"
  drm/i915: Re-enable GPU semaphores for SandyBridge mobile
  drm/i915: Replace vblank PM QoS with "Interrupt-Based AGPBUSY#"
  Revert "drm/i915: Use PM QoS to prevent C-State starvation of gen3 GPU"
  drm/i915: Allow relocation deltas outside of target bo
  drm/i915: Silence an innocuous compiler warning for an unused variable
  fs/block_dev.c: fix new kernel-doc warning
  ACPI: Fix build for CONFIG_NET unset
  mm: <asm-generic/pgtable.h> must include <linux/mm_types.h>
  x86: Use u32 instead of long to set reset vector back to 0
  ...

Conflicts:
	drivers/gpu/drm/i915/i915_gem.c

1 files changed, 26 insertions, 23 deletions

diff --git a/drivers/acpi/acpica/evxfgpe.c b/drivers/acpi/acpica/evxfgpe.c
index e9562a7cb2f9..3b20a3401b64 100644
--- a/drivers/acpi/acpica/evxfgpe.c
+++ b/drivers/acpi/acpica/evxfgpe.c
@@ -212,37 +212,40 @@ acpi_setup_gpe_for_wake(acpi_handle wake_device,
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
-        /* Validate wake_device is of type Device */
-
-        device_node = ACPI_CAST_PTR(struct acpi_namespace_node, wake_device);
-        if (device_node->type != ACPI_TYPE_DEVICE) {
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
-        }
-
         flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
 
         /* Ensure that we have a valid GPE number */
 
         gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);
-        if (gpe_event_info) {
-                /*
-                 * If there is no method or handler for this GPE, then the
-                 * wake_device will be notified whenever this GPE fires (aka
-                 * "implicit notify") Note: The GPE is assumed to be
-                 * level-triggered (for windows compatibility).
-                 */
-                if ((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
-                    ACPI_GPE_DISPATCH_NONE) {
-                        gpe_event_info->flags =
-                            (ACPI_GPE_DISPATCH_NOTIFY |
-                             ACPI_GPE_LEVEL_TRIGGERED);
-                        gpe_event_info->dispatch.device_node = device_node;
-                }
+        if (!gpe_event_info) {
+                goto unlock_and_exit;
+        }
+
+        /*
+         * If there is no method or handler for this GPE, then the
+         * wake_device will be notified whenever this GPE fires (aka
+         * "implicit notify") Note: The GPE is assumed to be
+         * level-triggered (for windows compatibility).
+         */
+        if (((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
+              ACPI_GPE_DISPATCH_NONE) && (wake_device != ACPI_ROOT_OBJECT)) {
 
-                gpe_event_info->flags |= ACPI_GPE_CAN_WAKE;
-                status = AE_OK;
+                /* Validate wake_device is of type Device */
+
+                device_node = ACPI_CAST_PTR(struct acpi_namespace_node,
+                                            wake_device);
+                if (device_node->type != ACPI_TYPE_DEVICE) {
+                        goto unlock_and_exit;
+                }
+                gpe_event_info->flags = (ACPI_GPE_DISPATCH_NOTIFY |
+                                         ACPI_GPE_LEVEL_TRIGGERED);
+                gpe_event_info->dispatch.device_node = device_node;
         }
 
+        gpe_event_info->flags |= ACPI_GPE_CAN_WAKE;
+        status = AE_OK;
+
+ unlock_and_exit:
         acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
         return_ACPI_STATUS(status);
 }